Browse Source

activat: apcmini, change DMX Numbering from 0 to 1

micha 3 years ago
parent
commit
92cd1d31c6

+ 55 - 12
Editor3.py

@@ -116,9 +116,9 @@ def update_dmx(attr,data,value=None,args=[fade],flash=0,pfx=""):
     if attr == "VDIM":
         for attr in data["ATTRIBUT"]:
             dmx = data["DMX"]
-            if data["ATTRIBUT"][attr]["NR"] < 0:
+            if data["ATTRIBUT"][attr]["NR"] < 0: #virtual channels
                 continue
-            dmx += data["ATTRIBUT"][attr]["NR"]
+            dmx += data["ATTRIBUT"][attr]["NR"]-1
             mode = ""
             if "MODE" in data["ATTRIBUT"][attr]:
                 mode = data["ATTRIBUT"][attr]["MODE"]
@@ -138,8 +138,8 @@ def update_dmx(attr,data,value=None,args=[fade],flash=0,pfx=""):
                     #print("cmd",cmd)
                 
         
-    elif data["ATTRIBUT"][attr]["NR"] >= 0:
-        dmx += data["ATTRIBUT"][attr]["NR"]
+    elif data["ATTRIBUT"][attr]["NR"] > 0: 
+        dmx += data["ATTRIBUT"][attr]["NR"]-1
         val = data["ATTRIBUT"][attr]["VALUE"]
         mode = ""
         if "MODE" in data["ATTRIBUT"][attr]:
@@ -457,6 +457,7 @@ class Xevent():
                         print("BLIND",self.data.val_commands)
                 elif self.attr == "BACKUP":
                     self.data.backup_presets()
+                    self.data.backup_patch()
                 return 0
             elif self.mode == "INPUT":
                 print(self.data.entry.get())
@@ -734,10 +735,11 @@ class Xevent():
             
 
                 
-
-        except Exception as e:
-            print("== cb EXCEPT",e)
-            print("Error on line {}".format(sys.exc_info()[-1].tb_lineno))
+        finally:
+            pass
+        #except Exception as e:
+        #    print("== cb EXCEPT",e)
+        #    print("Error on line {}".format(sys.exc_info()[-1].tb_lineno))
         #print(self.elem["text"],self.attr,self.data)
         
                                             
@@ -764,6 +766,7 @@ class Master():
 
         self.elem_presets = {}
         self.load_presets()
+        self.load_patch()
         
         for i in range(8*8):
             if i not in self.val_presets:
@@ -772,7 +775,13 @@ class Master():
                 self.val_presets[i] = OrderedDict() # FIX 
                 self.val_presets[i]["CFG"] =  OrderedDict() # CONFIG 
                 self.label_presets[i] = "-"
-        
+  
+    def __del__(self):
+        print("__del__",self)
+        self.backup_presets()
+        print("********************************************************")
+        self.backup_patch()
+        print("********************************************************")
     def load(self):
         fixture = OrderedDict()
 
@@ -814,7 +823,7 @@ class Master():
 
         fi = copy.deepcopy(fix)
         fi["DMX"] = 401
-        #fixture["1001"] = fi
+        fixture["1001"] = fi
         
         fi = copy.deepcopy(fix)
         fi["DMX"] = 421
@@ -924,6 +933,17 @@ class Master():
         self.fixtures = fixture
         
         
+    def load_patch(self):
+        filename="patch"
+        d,l = self._load(filename)
+        for i in d:
+            sdata = d[i]
+            print("load",filename,sdata)
+            #if "CFG" not in sdata:
+            #    sdata["CFG"] = OrderedDict()
+        self.fixtures = d
+        #self.label_presets = l
+        
     def load_presets(self):
         filename="presets"
         d,l = self._load(filename)
@@ -956,12 +976,35 @@ class Master():
             #print(xfname,"load",key,label)
             #print(line)
             jdata = json.loads(rdata,object_pairs_hook=OrderedDict)
-            
+            nrnull = 0
+            if "ATTRIBUT" in jdata:  # translate old fixtures start with 0 to 1          
+                for attr in jdata["ATTRIBUT"]:
+                    if "NR" in jdata["ATTRIBUT"][attr]:
+                        nr = jdata["ATTRIBUT"][attr]["NR"]
+                        if nr == 0:
+                            nrnull = 1
+                            break
+
+                if nrnull:
+                    print("DMX NR IS NULL",attr,"CHANGE +1")
+                    for attr in jdata["ATTRIBUT"]:
+                        if "NR" in jdata["ATTRIBUT"][attr]:
+                            nr = jdata["ATTRIBUT"][attr]["NR"]
+                            if nr >= 0:
+                                jdata["ATTRIBUT"][attr]["NR"] +=1
+
             data[key] = jdata
             labels[key] = label
             
         return data,labels
         
+    def backup_patch(self):
+        filename = "patch"
+        data  = self.fixtures
+        labels = {}
+        for k in data:
+            labels[k] = k
+        self._backup(filename,data,labels)
     def backup_presets(self):
         filename = "presets"
         data   = self.val_presets
@@ -982,7 +1025,7 @@ class Master():
             if label == "Name-"+str(key):
                 label = ""
             print(xfname,"load",key,label,len(line))
-            f.write(str(key)+"\t"+label+"\t"+json.dumps(line)+"\n")
+            f.write( "{}\t{}\t{}\n".format( key,label,json.dumps(line) ) )
         f.close()
             
     def draw_dim(self,fix,data,c=0,r=0,frame=None):

+ 36 - 5
AKAI_APCmini002.py → apcmini.py

@@ -48,7 +48,8 @@ else: # if linux
     #  4 MB RAM
     #from simplemidi_wraper import simplemidi
     from lib.simplemidi_wraper import simplemidi
-    midi = simplemidi("/dev/snd/midiC1D0") #,inp="/dev/midi1")
+    #midi = simplemidi("/dev/snd/midiC1D0") #,inp="/dev/midi1")
+    midi = simplemidi("/dev/snd/midiC2D0") #,inp="/dev/midi1")
 
 
 nr = 0
@@ -69,6 +70,7 @@ import socket, struct
 
 c = chat.tcp_sender()
 def send(msg):
+    print("send",msg)
     c.send(msg)
 
 
@@ -126,22 +128,28 @@ def main():
                     fader_value[fader_id] = value
                     print("FADER:",fader_id+1,value)
                     if fader_id == 0:
-                        msg = "group 33 level "+str(int(value))
+                        #msg = "group 33 level "+str(int(value))
+                        msg = "d{}:{}:0".format(fader_id+1,value)
                         send(msg)
                     elif fader_id == 1:
                         msg = "group 34 level "+str(int(value))
+                        msg = "d{}:{}:0".format(fader_id+1,value)
                         send(msg)
                     elif fader_id == 2:
                         msg = "group 35 level "+str(int(value))
+                        msg = "d{}:{}:0".format(fader_id+1,value)
                         send(msg)
                     elif fader_id == 3:
                         msg = "group 36 level "+str(int(value))
+                        msg = "d{}:{}:0".format(fader_id+1,value)
                         send(msg)
                     elif fader_id == 4:
                         msg = "group 37 level "+str(int(value))
+                        msg = "d{}:{}:0".format(fader_id+1,value)
                         send(msg)
                     elif fader_id == 5:
                         msg = "group 38 level "+str(int(value))
+                        msg = "d{}:{}:0".format(fader_id+1,value)
                         send(msg)
 
                     elif fader_id == 6:
@@ -208,21 +216,29 @@ def main():
                     pass#msg = "sel 3"
                     pass#send(msg)
                 elif midi_date[1] == 64:
-                    pass#msg = "group 1 sel 1 "
-                    pass#send(msg)
+                    msg = "df{}:255:0".format(midi_date[1]-64+1)
+                    send(msg)
                 elif midi_date[1] == 65:
+                    msg = "df{}:255:0".format(midi_date[1]-64+1)
+                    send(msg)
                     pass#msg = "group 25 sel 1 "
                     pass#send(msg)
                 elif midi_date[1] == 66:
+                    msg = "df{}:255:0".format(midi_date[1]-64+1)
+                    send(msg)
                     pass#msg = "group 17 sel 1 "
                     pass#send(msg)
                 elif midi_date[1] == 86:
+                    msg = "df{}:255:0".format(midi_date[1]-64+1)
+                    send(msg)
                     #msg = "group 25 sel 1 "
                     #send(msg)
                     #ipc = cli.ipc_write({"SDL-GUI":"VIEW:programmer"})
                     pass
 
                 elif midi_date[1] == 85:
+                    msg = "df{}:255:0".format(midi_date[1]-64)
+                    send(msg)
                     pass
                     #msg = "group 25 sel 1 "
                     #send(msg)
@@ -257,9 +273,24 @@ def main():
             if midi_date[0] == 128:
                 midi_date[2] = 0
                 midi_date[0] = 144
-                print("release")
+                #print("release")
                 release = 1
 
+                if midi_date[1] == 64:
+                    msg = "df{}:off:0".format(midi_date[1]-64+1)
+                    send(msg)
+                if midi_date[1] == 65:
+                    msg = "df{}:off:0".format(midi_date[1]-64+1)
+                    send(msg)
+                if midi_date[1] == 66:
+                    msg = "df{}:off:0".format(midi_date[1]-64+1)
+                    send(msg)
+                if midi_date[1] == 67:
+                    msg = "df{}:off:0".format(midi_date[1]-64+1)
+                    send(msg)
+                if midi_date[1] == 68:
+                    msg = "df{}:off:0".format(midi_date[1]-64+1)
+                    send(msg)
 
 
             else:

+ 2 - 0
fixtures/Martin_RushMH3_19ch.sav

@@ -0,0 +1,2 @@
+706	706	{"DMX": 258, "UNIVERS": 2, "NAME": "RUSH-BEAM", "ATTRIBUT": {"DIM": {"NR": 18, "MASTER": "1", "MODE": "F", "VALUE": 0.0, "ACTIVE": 0, "FX": ""}, "PAN": {"NR": 1, "MASTER": "", "MODE": "F", "VALUE": 127.0, "ACTIVE": 0, "FX": ""}, "PAN-FINE": {"NR": 2, "MASTER": "", "MODE": "F", "VALUE": 127.0, "ACTIVE": 0, "FX": ""}, "TILT": {"NR": 3, "MASTER": "", "MODE": "F", "VALUE": 127.0, "ACTIVE": 0, "FX": ""}, "TILT-FINE": {"NR": 4, "MASTER": "", "MODE": "F", "VALUE": 127.0, "ACTIVE": 0, "FX": ""}, "COLOR": {"NR": 9, "MASTER": "", "MODE": "S", "VALUE": 0, "ACTIVE": 0, "FX": ""}, "GOBO": {"NR": 10, "MASTER": "", "MODE": "S", "VALUE": 0.0, "ACTIVE": 0, "FX": ""}, "G-ROT": {"NR": 9, "MASTER": "", "MODE": "S", "VALUE": 192.0, "ACTIVE": 0, "FX": ""}, "PRISMA": {"NR": 11, "MASTER": "", "MODE": "S", "VALUE": 0.0, "ACTIVE": 0, "FX": ""}, "P-ROT": {"NR": 12, "MASTER": "", "MODE": "S", "VALUE": 0.0, "ACTIVE": 0, "FX": ""}, "FOCUS": {"NR": 15, "MASTER": "", "MODE": "F", "VALUE": 0.0, "ACTIVE": 0, "FX": ""}, "ZOOM": {"NR": 14, "MASTER": "", "MODE": "F", "VALUE": 0.0, "ACTIVE": 0, "FX": ""}, "FROST": {"NR": 16, "MASTER": "", "MODE": "F", "VALUE": 0.0, "ACTIVE": 0, "FX": ""}, "SHUTTER": {"NR": 17, "MASTER": "", "MODE": "S", "VALUE": 8.220000000000006, "ACTIVE": 0, "FX": ""}, "CONTROL": {"NR": 6, "MASTER": "", "MODE": "S", "VALUE": 5.0, "ACTIVE": 0, "FX": ""}}}
+s

+ 1 - 0
fixtures/generic_dimmer_1ch.sav

@@ -0,0 +1 @@
+1	1	{"DMX": 1, "UNIVERS": 2, "NAME": "F1", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 4.110000000000013, "ACTIVE": 0, "FX": ""}}}

+ 1 - 0
fixtures/generic_irgb_4ch.sav

@@ -0,0 +1 @@
+1001	1001	{"DMX": 401, "UNIVERS": 2, "NAME": "RGB", "ATTRIBUT": {"VDIM": {"NR": -1, "MASTER": "1", "MODE": "F", "VALUE": 0.0, "ACTIVE": 0}, "RED": {"NR": 1, "MASTER": "", "MODE": "F", "VALUE": 255.0, "ACTIVE": 0}, "GREEN": {"NR": 2, "MASTER": "", "MODE": "F", "VALUE": 255.0, "ACTIVE": 0}, "BLUE": {"NR": 3, "MASTER": "", "MODE": "F", "VALUE": 127.0, "ACTIVE": 0}}}

+ 1 - 0
fixtures/generic_rgbv_3ch.sav

@@ -0,0 +1 @@
+1001	1001	{"DMX": 401, "UNIVERS": 2, "NAME": "IRGB", "ATTRIBUT": {"DIM": {"NR": 0, "MASTER": "1", "MODE": "F", "VALUE": 0.0, "ACTIVE": 0}, "RED": {"NR": 3, "MASTER": "", "MODE": "F", "VALUE": 255.0, "ACTIVE": 0}, "GREEN": {"NR": 4, "MASTER": "", "MODE": "F", "VALUE": 255.0, "ACTIVE": 0}, "BLUE": {"NR": 5, "MASTER": "", "MODE": "F", "VALUE": 127.0, "ACTIVE": 0}}}

+ 9 - 0
show/GloryCamp2021/patch.sav

@@ -0,0 +1,9 @@
+1	1	{"DMX": 1, "UNIVERS": 2, "NAME": "F1", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 20.55, "ACTIVE": 0, "FX": ""}}}
+2	2	{"DMX": 2, "UNIVERS": 2, "NAME": "F2", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 0.0, "ACTIVE": 0}}}
+3	3	{"DMX": 3, "UNIVERS": 2, "NAME": "F3", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 0.0, "ACTIVE": 0}}}
+4	4	{"DMX": 4, "UNIVERS": 2, "NAME": "F4", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 0.0, "ACTIVE": 0}}}
+11	11	{"DMX": 11, "UNIVERS": 2, "NAME": "FL", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 0.0, "ACTIVE": 0}}}
+24	24	{"DMX": 24, "UNIVERS": 2, "NAME": "P", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 0.0, "ACTIVE": 0}}}
+1001	1001	{"DMX": 401, "UNIVERS": 2, "NAME": "IRGB", "ATTRIBUT": {"DIM": {"NR": 1, "MASTER": "1", "MODE": "F", "VALUE": 0.0, "ACTIVE": 0}, "RED": {"NR": 4, "MASTER": "", "MODE": "F", "VALUE": 256, "ACTIVE": 0}, "GREEN": {"NR": 5, "MASTER": "", "MODE": "F", "VALUE": 256, "ACTIVE": 0}, "BLUE": {"NR": 6, "MASTER": "", "MODE": "F", "VALUE": 196.87000000000023, "ACTIVE": 0}}}
+3001	3001	{"DMX": 241, "UNIVERS": 2, "NAME": "MH-BEAM", "ATTRIBUT": {"SHUTTER": {"NR": 6, "MASTER": "", "MODE": "S", "VALUE": 8.22, "ACTIVE": 0, "FX": ""}, "VDIM": {"NR": -1, "MASTER": "", "MODE": "F", "VALUE": 256, "ACTIVE": 0, "FX": ""}, "PAN": {"NR": 1, "MASTER": "", "MODE": "F", "VALUE": 147.55000000000007, "ACTIVE": 1, "FX": ""}, "PAN-FINE": {"NR": 2, "MASTER": "", "MODE": "F", "VALUE": 127.0, "ACTIVE": 0}, "TILT": {"NR": 3, "MASTER": "", "MODE": "F", "VALUE": 61.24000000000002, "ACTIVE": 1, "FX": ""}, "TILT-FINE": {"NR": 4, "MASTER": "", "MODE": "F", "VALUE": 127.0, "ACTIVE": 0}, "RED": {"NR": 7, "MASTER": "1", "MODE": "F", "VALUE": 256, "ACTIVE": 1, "FX": ""}, "GREEN": {"NR": 8, "MASTER": "1", "MODE": "F", "VALUE": 256, "ACTIVE": 0, "FX": ""}, "BLUE": {"NR": 9, "MASTER": "1", "MODE": "F", "VALUE": 196.87000000000023, "ACTIVE": 0, "FX": ""}}}
+3002	3002	{"DMX": 261, "UNIVERS": 2, "NAME": "MH-BEAM", "ATTRIBUT": {"SHUTTER": {"NR": 6, "MASTER": "", "MODE": "S", "VALUE": 8.22, "ACTIVE": 0, "FX": ""}, "VDIM": {"NR": -1, "MASTER": "", "MODE": "F", "VALUE": 256, "ACTIVE": 0, "FX": ""}, "PAN": {"NR": 1, "MASTER": "", "MODE": "F", "VALUE": 147.55000000000007, "ACTIVE": 1, "FX": ""}, "PAN-FINE": {"NR": 2, "MASTER": "", "MODE": "F", "VALUE": 127.0, "ACTIVE": 0}, "TILT": {"NR": 3, "MASTER": "", "MODE": "F", "VALUE": 61.24000000000002, "ACTIVE": 1, "FX": ""}, "TILT-FINE": {"NR": 4, "MASTER": "", "MODE": "F", "VALUE": 127.0, "ACTIVE": 0}, "RED": {"NR": 7, "MASTER": "1", "MODE": "F", "VALUE": 256, "ACTIVE": 1, "FX": ""}, "GREEN": {"NR": 8, "MASTER": "1", "MODE": "F", "VALUE": 256, "ACTIVE": 0, "FX": ""}, "BLUE": {"NR": 9, "MASTER": "1", "MODE": "F", "VALUE": 196.87000000000023, "ACTIVE": 0, "FX": ""}}}

+ 7 - 7
show/GloryCamp2021/presets.sav

@@ -1,11 +1,11 @@
 0	Front	{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "1": {"DIM": {"VALUE": 102.75000000000001, "FX": ""}}, "2": {"DIM": {"VALUE": 102.75000000000001, "FX": ""}}, "3": {"DIM": {"VALUE": 102.75000000000001, "FX": ""}}, "4": {"DIM": {"VALUE": 102.75000000000001, "FX": ""}}}
-1	strobo	{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "FL", "DELAY": 0}, "701": {"SHUTTER": {"VALUE": 78.09, "FX": ""}}, "702": {"SHUTTER": {"VALUE": 78.09, "FX": ""}}, "703": {"SHUTTER": {"VALUE": 78.09, "FX": ""}}, "704": {"SHUTTER": {"VALUE": 78.09, "FX": ""}}, "705": {"SHUTTER": {"VALUE": 78.09, "FX": ""}}, "706": {"SHUTTER": {"VALUE": 78.09, "FX": ""}}}
+1	strobo	{"CFG": {"FADE": 6.050000000000001, "DEALY": 0, "BUTTON": "FL", "DELAY": 0}, "3001": {"SHUTTER": {"VALUE": 217.8300000000003, "FX": ""}}, "3002": {"SHUTTER": {"VALUE": 217.8300000000003, "FX": ""}}}
 2	RDN STRB	{"CFG": {"FADE": 0.817539954132789, "DEALY": 0, "BUTTON": "FL", "DELAY": 0}, "701": {"SHUTTER": {"VALUE": 246.6000000000004, "FX": ""}}, "702": {"SHUTTER": {"VALUE": 246.6000000000004, "FX": ""}}, "703": {"SHUTTER": {"VALUE": 246.6000000000004, "FX": ""}}, "704": {"SHUTTER": {"VALUE": 246.6000000000004, "FX": ""}}, "705": {"SHUTTER": {"VALUE": 246.6000000000004, "FX": ""}}, "706": {"SHUTTER": {"VALUE": 246.6000000000004, "FX": ""}}}
 3	Prisma	{"CFG": {"FADE": 0.817539954132789, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "701": {"PRISMA": {"VALUE": 8.22, "FX": ""}}, "702": {"PRISMA": {"VALUE": 8.22, "FX": ""}}, "703": {"PRISMA": {"VALUE": 8.22, "FX": ""}}, "704": {"PRISMA": {"VALUE": 8.22, "FX": ""}}, "705": {"PRISMA": {"VALUE": 8.22, "FX": ""}}, "706": {"PRISMA": {"VALUE": 8.22, "FX": ""}}}
 4	LOWLIGHT	{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "FL", "DELAY": 0}, "701": {"DIM": {"VALUE": 0, "FX": ""}}, "702": {"DIM": {"VALUE": 0, "FX": ""}}, "703": {"DIM": {"VALUE": 0, "FX": ""}}, "704": {"DIM": {"VALUE": 0, "FX": ""}}, "705": {"DIM": {"VALUE": 0, "FX": ""}}, "706": {"DIM": {"VALUE": 0, "FX": ""}}}
 5	ZOOM	{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "701": {"ZOOM": {"VALUE": 0, "FX": ""}}, "702": {"ZOOM": {"VALUE": 0, "FX": ""}}, "703": {"ZOOM": {"VALUE": 0, "FX": ""}}, "704": {"ZOOM": {"VALUE": 0, "FX": ""}}, "705": {"ZOOM": {"VALUE": 0, "FX": ""}}, "706": {"ZOOM": {"VALUE": 0, "FX": ""}}}
-6	ZOOM 100	{"CFG": {"FADE": 0.817539954132789, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "701": {"ZOOM": {"VALUE": 256, "FX": ""}}, "702": {"ZOOM": {"VALUE": 256, "FX": ""}}, "703": {"ZOOM": {"VALUE": 256, "FX": ""}}, "704": {"ZOOM": {"VALUE": 256, "FX": ""}}, "705": {"ZOOM": {"VALUE": 256, "FX": ""}}, "706": {"ZOOM": {"VALUE": 256, "FX": ""}}}
-7	HOME	{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "3001": {"SHUTTER": {"VALUE": 9.11, "FX": ""}, "VDIM": {"VALUE": 256, "FX": ""}, "PAN": {"VALUE": 159.8800000000001, "FX": ""}, "TILT": {"VALUE": 209.20000000000027, "FX": ""}}, "3002": {"SHUTTER": {"VALUE": 9.11, "FX": ""}, "VDIM": {"VALUE": 256, "FX": ""}, "PAN": {"VALUE": 159.8800000000001, "FX": ""}, "TILT": {"VALUE": 209.20000000000027, "FX": ""}}}
+6	links	{"CFG": {"FADE": 5.0, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "3001": {"PAN": {"VALUE": 155.7700000000001, "FX": ""}, "TILT": {"VALUE": 61.24000000000002, "FX": ""}}, "3002": {"PAN": {"VALUE": 155.7700000000001, "FX": ""}, "TILT": {"VALUE": 61.24000000000002, "FX": ""}}}
+7	HOME	{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "3001": {"SHUTTER": {"VALUE": 8.22, "FX": ""}, "VDIM": {"VALUE": 256, "FX": ""}, "PAN": {"VALUE": 172.21000000000015, "FX": ""}, "TILT": {"VALUE": 61.24000000000002, "FX": ""}, "RED": {"VALUE": 256, "FX": ""}, "GREEN": {"VALUE": 256, "FX": ""}, "BLUE": {"VALUE": 196.87000000000023, "FX": ""}}, "3002": {"SHUTTER": {"VALUE": 8.22, "FX": ""}, "VDIM": {"VALUE": 256, "FX": ""}, "PAN": {"VALUE": 172.21000000000015, "FX": ""}, "TILT": {"VALUE": 61.24000000000002, "FX": ""}, "RED": {"VALUE": 256, "FX": ""}, "GREEN": {"VALUE": 256, "FX": ""}, "BLUE": {"VALUE": 196.87000000000023, "FX": ""}}}
 8	Front Off	{"1": {"DIM": {"VALUE": 0.0, "FX": ""}}, "2": {"DIM": {"VALUE": 0.0, "FX": ""}}, "3": {"DIM": {"VALUE": 0, "FX": ""}}, "4": {"DIM": {"VALUE": 0, "FX": ""}}, "CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
 9	PAN MID	{"CFG": {"FADE": 0.817539954132789, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "701": {"PAN": {"VALUE": null, "FX": "sinus:14:83:4267"}, "TILT": {"VALUE": null, "FX": "sinus:0:249:4267"}}, "702": {"PAN": {"VALUE": null, "FX": "sinus:14:83:4978"}, "TILT": {"VALUE": null, "FX": "sinus:0:249:4978"}}, "703": {"PAN": {"VALUE": null, "FX": "sinus:14:83:5689"}, "TILT": {"VALUE": null, "FX": "sinus:0:249:5689"}}, "704": {"PAN": {"VALUE": null, "FX": "sinus:14:83:6400"}, "TILT": {"VALUE": null, "FX": "sinus:0:249:6400"}}, "705": {"PAN": {"VALUE": null, "FX": "sinus:14:83:7111"}, "TILT": {"VALUE": null, "FX": "sinus:0:249:7111"}}, "706": {"PAN": {"VALUE": null, "FX": "sinus:14:83:7822"}, "TILT": {"VALUE": null, "FX": "sinus:0:249:7822"}}}
 10	MA Open	{"CFG": {"FADE": 4.545454545454545, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "701": {"DIM": {"VALUE": 256, "FX": ""}}, "702": {"DIM": {"VALUE": 256, "FX": ""}}, "703": {"DIM": {"VALUE": 256, "FX": ""}}, "704": {"DIM": {"VALUE": 256, "FX": ""}}, "705": {"DIM": {"VALUE": 256, "FX": ""}}, "706": {"DIM": {"VALUE": 256, "FX": ""}}}
@@ -29,7 +29,7 @@
 28	Audience	{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "701": {"PAN": {"VALUE": 147.55000000000007, "FX": ""}, "TILT": {"VALUE": 188.6500000000002, "FX": ""}}, "702": {"PAN": {"VALUE": 143.44000000000005, "FX": ""}, "TILT": {"VALUE": 196.87000000000023, "FX": ""}}, "703": {"PAN": {"VALUE": 168.10000000000014, "FX": ""}, "TILT": {"VALUE": 20.14000000000003, "FX": ""}}, "704": {"PAN": {"VALUE": 172.21000000000015, "FX": ""}, "TILT": {"VALUE": 20.14000000000003, "FX": ""}}, "705": {"PAN": {"VALUE": 106.45000000000002, "FX": ""}, "TILT": {"VALUE": 57.130000000000024, "FX": ""}}, "706": {"PAN": {"VALUE": 98.23000000000002, "FX": ""}, "TILT": {"VALUE": 69.46000000000002, "FX": ""}}}
 29	Oben	{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "701": {"PAN": {"VALUE": 147.55000000000007, "FX": ""}, "TILT": {"VALUE": 221.5300000000003, "FX": ""}}, "702": {"PAN": {"VALUE": 143.44000000000005, "FX": ""}, "TILT": {"VALUE": 229.75000000000034, "FX": ""}}, "703": {"PAN": {"VALUE": 168.10000000000014, "FX": ""}, "TILT": {"VALUE": 53.020000000000024, "FX": ""}}, "704": {"PAN": {"VALUE": 172.21000000000015, "FX": ""}, "TILT": {"VALUE": 53.020000000000024, "FX": ""}}, "705": {"PAN": {"VALUE": 106.45000000000002, "FX": ""}, "TILT": {"VALUE": 24.25000000000003, "FX": ""}}, "706": {"PAN": {"VALUE": 98.23000000000002, "FX": ""}, "TILT": {"VALUE": 28.360000000000028, "FX": ""}}}
 30	Oben Mitte	{"CFG": {"FADE": 3.756574004507888, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "701": {"PAN": {"VALUE": 131.11, "FX": ""}, "TILT": {"VALUE": 221.5300000000003, "FX": ""}}, "702": {"PAN": {"VALUE": 135.22000000000003, "FX": ""}, "TILT": {"VALUE": 221.5300000000003, "FX": ""}}, "703": {"PAN": {"VALUE": 176.32000000000016, "FX": ""}, "TILT": {"VALUE": 57.130000000000024, "FX": ""}}, "704": {"PAN": {"VALUE": 163.99000000000012, "FX": ""}, "TILT": {"VALUE": 53.020000000000024, "FX": ""}}, "705": {"PAN": {"VALUE": 118.78000000000002, "FX": ""}, "TILT": {"VALUE": 32.47000000000003, "FX": ""}}, "706": {"PAN": {"VALUE": 118.78000000000002, "FX": ""}, "TILT": {"VALUE": 32.47000000000003, "FX": ""}}}
-31	gerade	{"CFG": {"FADE": 4.545454545454545, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "701": {"PAN": {"VALUE": 122.89000000000001, "FX": ""}, "TILT": {"VALUE": 172.21000000000015, "FX": ""}}, "702": {"PAN": {"VALUE": 135.22000000000003, "FX": ""}, "TILT": {"VALUE": 184.5400000000002, "FX": ""}}, "703": {"PAN": {"VALUE": 168.10000000000014, "FX": ""}, "TILT": {"VALUE": 16.03000000000003, "FX": ""}}, "704": {"PAN": {"VALUE": 172.21000000000015, "FX": ""}, "TILT": {"VALUE": 20.14000000000003, "FX": ""}}, "705": {"PAN": {"VALUE": 114.67000000000002, "FX": ""}, "TILT": {"VALUE": 61.24000000000002, "FX": ""}}, "706": {"PAN": {"VALUE": 118.78000000000002, "FX": ""}, "TILT": {"VALUE": 61.24000000000002, "FX": ""}}}
+31	gerade	{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "3001": {"PAN": {"VALUE": 184.5400000000002, "FX": ""}, "TILT": {"VALUE": 57.130000000000024, "FX": ""}}, "3002": {"PAN": {"VALUE": 184.5400000000002, "FX": ""}, "TILT": {"VALUE": 57.130000000000024, "FX": ""}}}
 32	-	{"CFG": {"FADE": 4, "DELAY": 0, "BUTTON": "GO"}}
 33	-	{"CFG": {"FADE": 4, "DELAY": 0, "BUTTON": "GO"}}
 34	-	{"CFG": {"FADE": 4, "DELAY": 0, "BUTTON": "GO"}}
@@ -37,14 +37,14 @@
 36	-	{"CFG": {"FADE": 4, "DELAY": 0, "BUTTON": "GO"}}
 37	-	{"CFG": {"FADE": 4, "DELAY": 0, "BUTTON": "GO"}}
 38	-	{"CFG": {"FADE": 3.4150672768253525, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "1": {"DIM": {"VALUE": 256, "FX": ""}}, "2": {"DIM": {"VALUE": 256, "FX": ""}}, "3": {"DIM": {"VALUE": 256, "FX": ""}}, "4": {"DIM": {"VALUE": 256, "FX": ""}}}
-39	-	{"CFG": {"FADE": 3.4150672768253525, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "1": {"DIM": {"VALUE": 0, "FX": ""}}, "2": {"DIM": {"VALUE": 0, "FX": ""}}, "3": {"DIM": {"VALUE": 0, "FX": ""}}, "4": {"DIM": {"VALUE": 0, "FX": ""}}}
+39	open	{"CFG": {"FADE": 6.050000000000001, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "3001": {"SHUTTER": {"VALUE": 8.22, "FX": ""}}, "3002": {"SHUTTER": {"VALUE": 8.22, "FX": ""}}}
 40	-	{"CFG": {"FADE": 4, "DELAY": 0, "BUTTON": "GO"}}
 41	-	{"CFG": {"FADE": 4, "DELAY": 0, "BUTTON": "GO"}}
 42	-	{"CFG": {"FADE": 4, "DELAY": 0, "BUTTON": "GO"}}
 43	-	{"CFG": {"FADE": 4, "DELAY": 0, "BUTTON": "GO"}}
-44		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}}
+44	links	{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "3001": {"PAN": {"VALUE": 168.10000000000014, "FX": ""}, "TILT": {"VALUE": 61.24000000000002, "FX": ""}}, "3002": {"PAN": {"VALUE": 168.10000000000014, "FX": ""}, "TILT": {"VALUE": 61.24000000000002, "FX": ""}}}
 45	-	{"CFG": {"FADE": 4, "DELAY": 0, "BUTTON": "GO"}}
-46	-	{"CFG": {"FADE": 4, "DELAY": 0, "BUTTON": "GO"}}
+46	-	{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO"}, "3001": {"PAN": {"VALUE": 147.55000000000007, "FX": ""}, "TILT": {"VALUE": 61.24000000000002, "FX": ""}, "RED": {"VALUE": 256, "FX": ""}}, "3002": {"PAN": {"VALUE": 147.55000000000007, "FX": ""}, "TILT": {"VALUE": 61.24000000000002, "FX": ""}, "RED": {"VALUE": 256, "FX": ""}}}
 47	-	{"CFG": {"FADE": 4, "DELAY": 0, "BUTTON": "GO"}}
 48	-	{"CFG": {"FADE": 4, "DELAY": 0, "BUTTON": "GO"}}
 49	-	{"CFG": {"FADE": 4, "DELAY": 0, "BUTTON": "GO"}}

+ 0 - 0
show/GloryCamp2021X/patch.sav


+ 0 - 48
show/GloryCamp2021X/presets.sav

@@ -1,48 +0,0 @@
-0		{"3": {"DIM": 256}}
-1		{}
-2		{"1": {"DIM": 98.64}}
-3		{}
-4		{}
-5		{}
-6	XXX	{"701": {"PAN": 256}}
-7		{"3001": {"SHUTTER": 5.0}, "3002": {"SHUTTER": 5.0}}
-8	XXX	{"3": {"DIM": 112.14999999999958}}
-9		{"3001": {"PAN": 133.44999999999993, "TILT": 125.64999999999999}}
-10		{}
-11		{"3001": {"VDIM": 62.0, "PAN": 154.0, "TILT": 64.0, "RED": 57.0, "GREEN": 255.0, "BLUE": 159.0}}
-12		{"1": {"DIM": 61.65}, "3001": {"PAN": 47.13999999999993, "TILT": 117.42999999999999}}
-13		{}
-14		{"701": {"PAN": 136.8099999999996}}
-15		{}
-16		{"3": {"DIM": 0}}
-17		{}
-18		{}
-19		{}
-20		{}
-21		{}
-22		{}
-23		{}
-24		{}
-25		{}
-26		{}
-27		{"3001": {"PAN": 161.4699999999997, "TILT": 86.31}, "3002": {"PAN": 161.4699999999997, "TILT": 86.31}, "701": {"PAN": 161.4699999999997, "TILT": 86.31}}
-28		{"3001": {"PAN": 120.36999999999958, "TILT": 32.880000000000024}, "3002": {"PAN": 120.36999999999958, "TILT": 32.880000000000024}, "701": {"PAN": 120.36999999999958, "TILT": 32.880000000000024}}
-29		{}
-30		{}
-31		{}
-32		{}
-33		{}
-34		{}
-35		{"3001": {"PAN": 161.4699999999997, "TILT": 86.31}, "3002": {"PAN": 161.4699999999997, "TILT": 86.31}, "701": {"PAN": 161.4699999999997, "TILT": 86.31}}
-36		{"3001": {"PAN": 120.36999999999958, "TILT": 32.880000000000024}, "3002": {"PAN": 120.36999999999958, "TILT": 32.880000000000024}, "701": {"PAN": 120.36999999999958, "TILT": 32.880000000000024}}
-37		{}
-38		{}
-39		{}
-40		{}
-41		{}
-42		{}
-43		{}
-44		{}
-45		{}
-46		{}
-47		{}

+ 0 - 1
show/mitte.p

@@ -1 +0,0 @@
-RED=d205:255,d206:0,d207:0

+ 0 - 0
show/patch.sav


+ 0 - 3
show/preset.log

@@ -1,3 +0,0 @@
-RED=RED:255,BLUE:0,GREEN:0
-BLUE=RED:0,BLUE:255,GREEN:0
-GREEN=RED:0,BLUE:0,GREEN:255

+ 0 - 48
show/preset.sav

@@ -1,48 +0,0 @@
-0	D100%	{"701": {"DIM": 255.0}, "702": {"DIM": 255.0}, "703": {"DIM": 255.0}, "704": {"DIM": 255.0}, "705": {"DIM": 255.0}, "706": {"DIM": 255.0}}
-1	Z100%	{"2001": {"VDIM": 255.0}, "2002": {"VDIM": 255.0}, "2003": {"VDIM": 255.0}, "2004": {"VDIM": 255.0}, "2005": {"VDIM": 255.0}, "2006": {"VDIM": 255.0}}
-2	Red	{"701": {"COLOR": 5.0}, "702": {"COLOR": 5.0}, "703": {"COLOR": 5.0}, "704": {"COLOR": 5.0}, "705": {"COLOR": 5.0}, "706": {"COLOR": 5.0}}
-3	Green	{"701": {"COLOR": 10.0}, "702": {"COLOR": 10.0}, "703": {"COLOR": 10.0}, "704": {"COLOR": 10.0}, "705": {"COLOR": 10.0}, "706": {"COLOR": 10.0}}
-4	Blau	{}
-5	Cyan	{}
-6	Magenta	{}
-7	Yellow	{"701": {"COLOR": 10.0}, "702": {"COLOR": 10.0}, "703": {"COLOR": 10.0}, "704": {"COLOR": 10.0}, "705": {"COLOR": 10.0}, "706": {"COLOR": 10.0}}
-8	D0%	{"701": {"DIM": 0.0}, "702": {"DIM": 0.0}, "703": {"DIM": 0.0}, "704": {"DIM": 0.0}, "705": {"DIM": 0.0}, "706": {"DIM": 0.0}}
-9	Z0%	{"2001": {"VDIM": 0.0}, "2002": {"VDIM": 0.0}, "2003": {"VDIM": 0.0}, "2004": {"VDIM": 0.0}, "2005": {"VDIM": 0.0}, "2006": {"VDIM": 0.0}}
-10	Weiß	{"701": {"COLOR": 0.0}, "702": {"COLOR": 0.0}, "703": {"COLOR": 0.0}, "704": {"COLOR": 0.0}, "705": {"COLOR": 0.0}, "706": {"COLOR": 0.0}}
-11		{}
-12		{}
-13		{}
-14	LAMP ON	{"701": {"CONTROL": 134.0}, "702": {"CONTROL": 134.0}, "703": {"CONTROL": 134.0}, "704": {"CONTROL": 134.0}, "705": {"CONTROL": 138.0}, "706": {"CONTROL": 135.0}}
-15	LAMP OFF	{"701": {"CONTROL": 234.0}, "702": {"CONTROL": 234.0}, "703": {"CONTROL": 234.0}, "704": {"CONTROL": 234.0}, "705": {"CONTROL": 234.0}, "706": {"CONTROL": 234.0}}
-16		{}
-17		{}
-18		{}
-19		{}
-20		{}
-21		{}
-22		{}
-23	LAMP SAV	{"701": {"CONTROL": 255.0}, "702": {"CONTROL": 255.0}, "703": {"CONTROL": 255.0}, "704": {"CONTROL": 255.0}, "705": {"CONTROL": 255.0}, "706": {"CONTROL": 255.0}}
-24	Mitte	{"701": {"PAN": 57.0, "TILT": 64.0}, "702": {"PAN": 53.0, "TILT": 67.0}, "703": {"PAN": 113.0, "TILT": 67.0}, "704": {"PAN": 116.0, "TILT": 67.0}, "705": {"PAN": 175.0, "TILT": 13.0}, "706": {"PAN": 161.0, "TILT": 15.0}}
-25	Oben	{"701": {"PAN": 51.0, "TILT": 34.0}, "702": {"PAN": 47.0, "TILT": 30.0}, "703": {"PAN": 116.0, "TILT": 31.0}, "704": {"PAN": 118.0, "TILT": 31.0}, "705": {"PAN": 178.0, "TILT": 61.0}, "706": {"PAN": 161.0, "TILT": 63.0}}
-26	Ausen	{"701": {"COLOR": 10.0}, "702": {"COLOR": 10.0}, "703": {"COLOR": 10.0}, "704": {"COLOR": 10.0}, "705": {"COLOR": 10.0}, "706": {"COLOR": 10.0}}
-27	Innen	{"701": {"COLOR": 10.0}, "702": {"COLOR": 10.0}, "703": {"COLOR": 10.0}, "704": {"COLOR": 10.0}, "705": {"COLOR": 10.0}, "706": {"COLOR": 10.0}}
-28	XXX	{}
-29	WWW	{}
-30	VVV	{}
-31	CENTER	{"701": {"PAN": 127.0, "TILT": 127.0}, "702": {"PAN": 127.0, "TILT": 127.0}, "703": {"PAN": 127.0, "TILT": 127.0}, "704": {"PAN": 127.0, "TILT": 127.0}, "705": {"PAN": 127.0, "TILT": 127.0}, "706": {"PAN": 127.0, "TILT": 127.0}}
-32		{}
-33		{}
-34		{}
-35		{}
-36		{}
-37		{}
-38		{}
-39		{}
-40		{}
-41		{}
-42		{}
-43		{}
-44		{}
-45		{}
-46		{}
-47		{}

+ 0 - 48
show/preset1.sav

@@ -1,48 +0,0 @@
-0	D100%	{"701": {"DIM": 255.0}, "702": {"DIM": 255.0}, "703": {"DIM": 255.0}, "704": {"DIM": 255.0}, "705": {"DIM": 255.0}, "706": {"DIM": 255.0}}
-1	Z100%	{"2001": {"VDIM": 255.0}, "2002": {"VDIM": 255.0}, "2003": {"VDIM": 255.0}, "2004": {"VDIM": 255.0}, "2005": {"VDIM": 255.0}, "2006": {"VDIM": 255.0}}
-2	Red	{}
-3	Green	{}
-4	Blau	{}
-5	Cyan	{}
-6	Magenta	{}
-7	Yellow	{}
-8	D0%	{"701": {"DIM": 0.0}, "702": {"DIM": 0.0}, "703": {"DIM": 0.0}, "704": {"DIM": 0.0}, "705": {"DIM": 0.0}, "706": {"DIM": 0.0}}
-9	Z0%	{"2001": {"VDIM": 0.0}, "2002": {"VDIM": 0.0}, "2003": {"VDIM": 0.0}, "2004": {"VDIM": 0.0}, "2005": {"VDIM": 0.0}, "2006": {"VDIM": 0.0}}
-10	Weiß	{"2001": {"RED": 255.0, "GREEN": 255.0, "BLUE": 127.0}, "2002": {"RED": 255.0, "GREEN": 255.0, "BLUE": 127.0}, "2003": {"RED": 255.0, "GREEN": 255.0, "BLUE": 127.0}, "2004": {"RED": 255.0, "GREEN": 255.0, "BLUE": 127.0}, "2005": {"RED": 255.0, "GREEN": 255.0, "BLUE": 127.0}, "2006": {"RED": 255.0, "GREEN": 255.0, "BLUE": 127.0}}
-11		{}
-12		{}
-13		{}
-14	LAMP ON	{"701": {"CONTROL": 134.0}, "702": {"CONTROL": 134.0}, "703": {"CONTROL": 134.0}, "704": {"CONTROL": 134.0}, "705": {"CONTROL": 138.0}, "706": {"CONTROL": 135.0}}
-15	LAMP OFF	{"701": {"CONTROL": 234.0}, "702": {"CONTROL": 234.0}, "703": {"CONTROL": 234.0}, "704": {"CONTROL": 234.0}, "705": {"CONTROL": 234.0}, "706": {"CONTROL": 234.0}}
-16		{}
-17		{}
-18		{}
-19		{}
-20		{}
-21		{}
-22		{}
-23	LAMP SAV	{"701": {"CONTROL": 255.0}, "702": {"CONTROL": 255.0}, "703": {"CONTROL": 255.0}, "704": {"CONTROL": 255.0}, "705": {"CONTROL": 255.0}, "706": {"CONTROL": 255.0}}
-24	Mitte	{"2001": {"PAN": 127.0, "TILT": 127.0}, "2002": {"PAN": 127.0, "TILT": 127.0}}
-25	Oben	{"701": {"PAN": 127.0, "TILT": 26.0}, "702": {"PAN": 127.0, "TILT": 26.0}, "703": {"PAN": 127.0, "TILT": 26.0}, "704": {"PAN": 127.0, "TILT": 26.0}, "705": {"PAN": 127.0, "TILT": 26.0}, "706": {"PAN": 127.0, "TILT": 26.0}}
-26	Ausen	{"701": {"PAN": 47.0, "TILT": 26.0}, "702": {"PAN": 47.0, "TILT": 26.0}, "703": {"PAN": 47.0, "TILT": 26.0}, "704": {"PAN": 47.0, "TILT": 26.0}, "705": {"PAN": 47.0, "TILT": 26.0}, "706": {"PAN": 47.0, "TILT": 26.0}}
-27	Innen	{"701": {"PAN": 191.0, "TILT": 26.0}, "702": {"PAN": 191.0, "TILT": 26.0}, "703": {"PAN": 191.0, "TILT": 26.0}, "704": {"PAN": 191.0, "TILT": 26.0}, "705": {"PAN": 191.0, "TILT": 26.0}, "706": {"PAN": 191.0, "TILT": 26.0}}
-28	XXX	{}
-29	WWW	{}
-30	VVV	{}
-31	CENTER	{"701": {"PAN": 127.0, "TILT": 127.0}, "702": {"PAN": 127.0, "TILT": 127.0}, "703": {"PAN": 127.0, "TILT": 127.0}, "704": {"PAN": 127.0, "TILT": 127.0}, "705": {"PAN": 127.0, "TILT": 127.0}, "706": {"PAN": 127.0, "TILT": 127.0}}
-32		{}
-33		{}
-34		{}
-35		{}
-36		{}
-37		{}
-38		{}
-39		{}
-40		{}
-41		{}
-42		{}
-43		{}
-44		{}
-45		{}
-46		{}
-47		{}

+ 0 - 3
show/rot.p

@@ -1,3 +0,0 @@
-d205:255,d206:0,d207:0
-d205:255,d206:0,d207:0
-d205:255,d206:0,d207:0