瀏覽代碼

add: fx parameter, circle btn, fadetime ON

micha 3 年之前
父節點
當前提交
8fdf6f7948
共有 4 個文件被更改,包括 205 次插入31 次删除
  1. 137 11
      Editor3.py
  2. 20 20
      show/GloryCamp2021/presets.sav
  3. 0 0
      show/GloryCamp2021X/patch.sav
  4. 48 0
      show/GloryCamp2021X/presets.sav

+ 137 - 11
Editor3.py

@@ -74,6 +74,9 @@ INT   = ["DIM","SHUTTER","STROBE","FUNC"]
 client = chat.tcp_sender()
 
 fade = 5 #2 #0.1 #1.13
+fade_on = 1
+fx_prm = {"SIZE":20,"SPEED":100,"OFFSET":50}
+
 def build_cmd(dmx,val,args=[fade],flash=0,xpfx="",attr=""):
     cmd=""
     if xpfx:
@@ -232,7 +235,7 @@ class Xevent():
                         if STORE:
                             self.data.val_commands["STORE"] = 0
                             STORE = 0
-                            self.data.elem_commands["STORE"]["bg"] = "lightgrey"
+                            self.data.elem_commands["STORE"]["bg"] = "grey"
 
                         else: 
                             for fix in self.data.fixtures:
@@ -247,9 +250,71 @@ class Xevent():
                                 #print(data["ATTRIBUT"])
 
                         
+                if self.attr.startswith("SZ:"):#SIN":
+                    #global fx_prm
+                    k = "SIZE"
+                    if event.num == 1:
+                        pass
+                    elif event.num == 2:
+                        pass
+                    elif event.num == 4:
+                        if fx_prm[k] <= 0:
+                            fx_prm[k] = 1
+                        fx_prm[k] *=1.2
+                    elif event.num == 5:
+                        fx_prm[k] /=1.2
+                    #fx_prm[k] =int(fx_prm[k])
+                    
+                    if fx_prm[k] > 4000:
+                        fx_prm[k] = 4000
+                    if fx_prm[k] < 0:
+                        fx_prm[k] =0
+                    self.data.elem_commands[self.attr]["text"] = "SZ:{:0.0f}".format(fx_prm[k])
+                if self.attr.startswith("SP:"):#SIN":
+                    #global fx_prm
+                    k = "SPEED"
+                    if event.num == 1:
+                        pass
+                    elif event.num == 2:
+                        pass
+                    elif event.num == 4:
+                        if fx_prm[k] <= 0:
+                            fx_prm[k] = 1
+                        fx_prm[k] *=1.2
+                    elif event.num == 5:
+                        fx_prm[k] /=1.2
+                    #fx_prm[k] =int(fx_prm[k])
+                    
+                    if fx_prm[k] > 4000:
+                        fx_prm[k] = 4000
+                    if fx_prm[k] < 0:
+                        fx_prm[k] =0
+                    self.data.elem_commands[self.attr]["text"] = "SP:{:0.0f}".format(fx_prm[k])
+                if self.attr.startswith("OF:"):#SIN":
+                    #global fx_prm
+                    k = "OFFSET"
+                    if event.num == 1:
+                        pass
+                    elif event.num == 2:
+                        pass
+                    elif event.num == 4:
+                        if fx_prm[k] <= 0:
+                            fx_prm[k] = 1
+                        fx_prm[k] *=1.2
+                    elif event.num == 5:
+                        fx_prm[k] /=1.2
+                    #fx_prm[k] =int(fx_prm[k])
+                    
+                    if fx_prm[k] > 1024:
+                        fx_prm[k] = 1024
+                    if fx_prm[k] < 0:
+                        fx_prm[k] =0
+
+                    self.data.elem_commands[self.attr]["text"] = "OF:{:0.0f}".format(fx_prm[k])
                 if self.attr.startswith("FX:"):#SIN":
                     if event.num == 1:
                         cmd = ""
+                        offset = 0
                         for fix in self.data.fixtures:
                             data = self.data.fixtures[fix]
                             #print( "ADD FX",fix)
@@ -259,9 +324,14 @@ class Xevent():
 
                                 fx=""
                                 if "SIN" in self.attr:
-                                    fx = "sinus:40:100:10"
+                                    fx = "sinus:{:0.0f}:{:0.0f}:{:0.0f}".format(fx_prm["SIZE"],fx_prm["SPEED"],offset)#fx_prm["OFFSET"])
                                 elif "COS" in self.attr:
-                                    fx = "cosinus:40:100:10"
+                                    fx = "cosinus:{:0.0f}:{:0.0f}:{:0.0f}".format(fx_prm["SIZE"],fx_prm["SPEED"],offset)#fx_prm["OFFSET"])
+                                elif "CIR" in self.attr:
+                                    if attr == "PAN":
+                                        fx = "cosinus:{:0.0f}:{:0.0f}:{:0.0f}".format(fx_prm["SIZE"],fx_prm["SPEED"],offset)#fx_prm["OFFSET"])
+                                    if attr == "TILT":
+                                        fx = "sinus:{:0.0f}:{:0.0f}:{:0.0f}".format(fx_prm["SIZE"],fx_prm["SPEED"],offset)#fx_prm["OFFSET"])
 
                                 if "FX" not in data["ATTRIBUT"][attr]:
                                     data["ATTRIBUT"][attr]["FX"] =""
@@ -271,6 +341,7 @@ class Xevent():
                                     data["ATTRIBUT"][attr]["FX"] = fx #"sinus:40:100:10"
                                 
                                     cmd+=update_dmx(attr,data,pfx="fx",value=fx)#,flash=FLASH)
+                            offset += fx_prm["OFFSET"]
                         if cmd and not BLIND:
                             client.send(cmd)
 
@@ -287,7 +358,7 @@ class Xevent():
                     if event.num == 1:
                         if FLASH:
                             FLASH = 0
-                            self.data.elem_commands[self.attr]["bg"] = "lightgrey"
+                            self.data.elem_commands[self.attr]["bg"] = "grey"
                         else:
                             FLASH = 1
                             self.data.elem_commands[self.attr]["bg"] = "green"
@@ -298,13 +369,46 @@ class Xevent():
                         if self.data.val_commands[self.attr]:
                             self.data.val_commands[self.attr] = 0
                             BLIND = 0
-                            self.data.elem_commands[self.attr]["bg"] = "lightgrey"
+                            self.data.elem_commands[self.attr]["bg"] = "grey"
                         else:
                             self.data.val_commands[self.attr] = 1
                             BLIND = 1
                             self.data.elem_commands[self.attr]["bg"] = "red"
                         print("BLIND",self.data.val_commands)
                 
+                elif self.attr == "FADE":
+                    global fade
+                    global fade_on
+                    if fade < 0.01:
+                        fade = 0.01
+                    elif fade > 100.0:
+                        fade = 100
+                    if event.num == 4:
+                        fade *= 1.1
+                    elif event.num == 5:
+                        fade /= 1.1
+                    elif event.num == 1:
+                        if fade_on:
+                            fade_on = 0
+                            self.data.elem_commands[self.attr]["bg"] = "grey"
+                        else:
+                            fade_on = 1
+                            self.data.elem_commands[self.attr]["bg"] = "green"
+                    elif event.num == 2:
+                        if fade > 1 and fade < 4:
+                            fade = 4
+                        elif fade > 3 and fade < 6:
+                            fade = 6
+                        elif fade > 5 and fade < 7:
+                            fade = 8
+                        elif fade > 7 and fade < 9:
+                            fade = 10
+                        elif fade > 9:
+                            fade = 0.01
+                        elif fade < 1:
+                            fade = 1.1
+
+                    self.data.elem_commands[self.attr]["text"] = "Fade{:0.2f}".format(fade)
                 elif self.attr == "CFG-BTN":
                     global CFG_BTN
                     if event.num == 1:
@@ -327,7 +431,7 @@ class Xevent():
                     if event.num == 1:
                         if STONY_FX:
                             STONY_FX = 0
-                            self.data.elem_commands[self.attr]["bg"] = "lightgrey"
+                            self.data.elem_commands[self.attr]["bg"] = "grey"
                         else:
                             STONY_FX = 1
                             self.data.elem_commands[self.attr]["bg"] = "red"
@@ -420,6 +524,7 @@ class Xevent():
                                         if sdata[fix][attr]["VALUE"] is not None:
                                             val_color = 1
 
+                            self.data.elem_presets[nr]["fg"] = "black"
                             if val_color:
                                 self.data.elem_presets[nr]["bg"] = "yellow"
                                 if fx_color:
@@ -428,6 +533,7 @@ class Xevent():
                                 if fx_color:
                                     self.data.elem_presets[nr]["bg"] = "cyan"
                         else:
+                            self.data.elem_presets[nr]["fg"] = "black"
                             self.data.elem_presets[nr]["bg"] = "grey"
                         #self.data.elem_presets[nr].option_add("*Font", FontBold)
                         label = ""
@@ -513,7 +619,11 @@ class Xevent():
                                                 if v2_fx:
                                                     cmd+=update_dmx(attr,data,pfx="fxf",value="off",flash=xFLASH)#,flash=FLASH)
                                         else:
-                                            cmd+=update_dmx(attr,data,flash=xFLASH)
+                                            if fade_on:
+                                                xfade = fade
+                                            else:
+                                                xfade = 0
+                                            cmd+=update_dmx(attr,data,args=[xfade],flash=xFLASH)
                                             if v2_fx:
                                                 cmd+=update_dmx(attr,data,pfx="fx",value=v2_fx,flash=xFLASH)#,flash=FLASH)
                                         #worker.fade_dmx(fix,attr,data,v,v2)
@@ -586,9 +696,10 @@ class Xevent():
                             elem["bg"] = "yellow"
                             if "FX" in data["ATTRIBUT"][attr]:#["FX"]:# = 1
                                 if data["ATTRIBUT"][attr]["FX"]:# = 1
-                                    elem["fg"] = "cyan"
+                                    elem["fg"] = "blue"
                                 else:
-                                    elem["fg"] = "grey"
+                                    elem["fg"] = "blue"
+                                    elem["fg"] = "black"
                             
 
                         if not data["ATTRIBUT"][attr]["ACTIVE"]:
@@ -640,8 +751,8 @@ class Master():
         self.elem_attr = {}
         
         self.commands =["BLIND","CLEAR","STORE","EDIT","","CFG-BTN","LABEL"
-                ,"BACKUP","SET","","","SELECT","ACTIVATE","FLASH","",
-                "STONY_FX","FX OFF", "FX:SIN","FX:COS",]
+                ,"BACKUP","SET","","","SELECT","ACTIVATE","FLASH","FADE",
+                "STONY_FX","FX OFF", "FX:SIN","FX:COS","FX:CIR","SZ:","SP:","OF:"]
         self.elem_commands = {}
         self.val_commands = {}
 
@@ -996,8 +1107,22 @@ class Master():
                 self.elem_commands[comm] = b
                 self.val_commands[comm] = 0
             b.bind("<Button>",Xevent(fix=0,elem=b,attr=comm,data=self,mode="COMMAND").cb)
+            if comm == "BLIND":
+                b["bg"] = "grey"
+            if comm == "CLEAR":
+                b["bg"] = "grey"
+            if comm == "STONY_FX":
+                b["bg"] = "grey"
+            if comm == "FADE":
+                b["bg"] = "green"
             if comm == "FX OFF":
                 b["bg"] = "magenta"
+            if comm == "SZ:":
+                b["text"] = "SZ:{:0.0f}".format(fx_prm["SIZE"])
+            if comm == "SP:":
+                b["text"] = "SP:{:0.0f}".format(fx_prm["SPEED"])
+            if comm == "OF:":
+                b["text"] = "OF:{:0.0f}".format(fx_prm["OFFSET"])
             if comm:
                 b.grid(row=r, column=c, sticky=tk.W+tk.E)
             c+=1
@@ -1057,6 +1182,7 @@ class Master():
                                 if sdata[fix][attr]["VALUE"] is not None:
                                     val_color = 1
 
+                    b["fg"] = "black"
                     if val_color:
                         b["bg"] = "gold"
                         if fx_color:

+ 20 - 20
show/GloryCamp2021/presets.sav

@@ -1,42 +1,42 @@
 0	Front	{"1": {"DIM": {"VALUE": 78.09, "FX": ""}}, "2": {"DIM": {"VALUE": 78.09, "FX": ""}}, "3": {"DIM": {"VALUE": 78.09, "FX": ""}}, "4": {"DIM": {"VALUE": 78.09, "FX": ""}}, "CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
-1	strobo	{"3001": {"SHUTTER": {"VALUE": 206.39000000000024, "FADE": 5, "FX": ""}}, "3002": {"SHUTTER": {"VALUE": 206.39000000000024, "FADE": 5, "FX": ""}}, "CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
+1	strobo	{"3001": {"SHUTTER": {"VALUE": 206.39000000000024, "FADE": 5, "FX": ""}}, "3002": {"SHUTTER": {"VALUE": 206.39000000000024, "FADE": 5, "FX": ""}}, "CFG": {"BUTTON": "FL", "FADE": 4, "DELAY": 0}}
 2		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
 3		{"3001": {"PAN": {"VALUE": 243.66999999999996, "FADE": 5, "FX": ""}, "TILT": {"VALUE": 69.46000000000001, "FADE": 5, "FX": ""}}, "3002": {"PAN": {"VALUE": 243.66999999999996, "FADE": 5, "FX": ""}, "TILT": {"VALUE": 69.46000000000001, "FADE": 5, "FX": ""}}, "CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
-4		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
-5		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
-6	test	{"3001": {"PAN": {"VALUE": 94.12000000000002, "FX": "sinus:40:100:10"}, "TILT": {"VALUE": 98.23, "FX": "cosinus:40:100:10"}}, "3002": {"PAN": {"VALUE": 94.12000000000002, "FX": "sinus:40:100:10"}, "TILT": {"VALUE": 98.23, "FX": "cosinus:40:100:10"}}, "CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
-7		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "3001": {"TILT": {"VALUE": null, "FX": "sinus:40:100:10"}}, "3002": {"TILT": {"VALUE": null, "FX": "sinus:40:100:10"}}}
+4	LOWLIGHT	{"CFG": {"FADE": 1.1969602468458167, "DEALY": 0, "BUTTON": "FL", "DELAY": 0}, "3001": {"VDIM": {"VALUE": 0, "FX": ""}}, "3002": {"VDIM": {"VALUE": 0, "FX": ""}}}
+5		{"CFG": {"FADE": 1.1969602468458167, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "3001": {"PAN": {"VALUE": null, "FX": "cosinus:42:104:1548"}, "TILT": {"VALUE": null, "FX": "sinus:42:104:1548"}}, "3002": {"PAN": {"VALUE": null, "FX": "cosinus:42:104:1806"}, "TILT": {"VALUE": null, "FX": "sinus:42:104:1806"}}}
+6	test	{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}}
+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": ""}}}
 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		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
 10		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
 11		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
 12		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
-13		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
+13	test	{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "3001": {"PAN": {"VALUE": 180.43000000000018, "FX": ""}, "TILT": {"VALUE": 127.0, "FX": ""}}, "3002": {"PAN": {"VALUE": 180.43000000000018, "FX": ""}, "TILT": {"VALUE": 127.0, "FX": ""}}}
 14		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}}
 15		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "XX", "DELAY": 0}}
 16		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
 17		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
-18		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
-19		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
-20		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
-21		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO"}, "3001": {"PAN": {"VALUE": 118.78, "FX": ""}, "TILT": {"VALUE": 122.89, "FX": ""}}, "3002": {"PAN": {"VALUE": 118.78, "FX": ""}, "TILT": {"VALUE": 122.89, "FX": ""}}}
-22		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO"}, "3001": {"PAN": {"VALUE": 118.78, "FX": ""}, "TILT": {"VALUE": 122.89, "FX": "cosinus:40:100:10"}}, "3002": {"PAN": {"VALUE": 118.78, "FX": ""}, "TILT": {"VALUE": 122.89, "FX": "cosinus:40:100:10"}}}
-23		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO"}, "3001": {"PAN": {"VALUE": 118.78, "FX": ""}, "TILT": {"VALUE": 122.89, "FX": ""}}, "3002": {"PAN": {"VALUE": 118.78, "FX": ""}, "TILT": {"VALUE": 122.89, "FX": ""}}}
-24		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
+18		{"CFG": {"FADE": 1.1969602468458167, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}}
+19		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}}
+20		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}}
+21		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "3001": {"PAN": {"VALUE": 180.43000000000018, "FX": ""}, "TILT": {"VALUE": 176.32000000000016, "FX": ""}}, "3002": {"PAN": {"VALUE": 180.43000000000018, "FX": ""}, "TILT": {"VALUE": 85.9, "FX": ""}}}
+22		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}}
+23		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "3001": {"PAN": {"VALUE": 118.78, "FX": ""}, "TILT": {"VALUE": 122.89, "FX": ""}}, "3002": {"PAN": {"VALUE": 118.78, "FX": ""}, "TILT": {"VALUE": 122.89, "FX": ""}}}
+24	CircleOFS	{"CFG": {"FADE": 1.1969602468458167, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "3001": {"PAN": {"VALUE": null, "FX": "cosinus:42:104:1548"}, "TILT": {"VALUE": null, "FX": "sinus:42:104:1548"}}, "3002": {"PAN": {"VALUE": null, "FX": "cosinus:42:104:1806"}, "TILT": {"VALUE": null, "FX": "sinus:42:104:1806"}}}
 25		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
 26		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
 27		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
 28		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
-29		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO"}, "3001": {"PAN": {"VALUE": null, "FX": ""}, "TILT": {"VALUE": null, "FX": ""}}, "3002": {"PAN": {"VALUE": null, "FX": ""}, "TILT": {"VALUE": null, "FX": ""}}}
-30		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO"}, "3001": {"PAN": {"VALUE": null, "FX": ""}, "TILT": {"VALUE": null, "FX": "cosinus:40:100:10"}}, "3002": {"PAN": {"VALUE": null, "FX": ""}, "TILT": {"VALUE": null, "FX": "cosinus:40:100:10"}}}
-31		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO"}, "3001": {"PAN": {"VALUE": 135.22000000000003, "FX": ""}, "TILT": {"VALUE": 106.45, "FX": ""}}, "3002": {"PAN": {"VALUE": 135.22000000000003, "FX": ""}, "TILT": {"VALUE": 106.45, "FX": ""}}}
+29		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}}
+30		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}}
+31		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "3001": {"PAN": {"VALUE": 135.22000000000003, "FX": ""}, "TILT": {"VALUE": 106.45, "FX": ""}}, "3002": {"PAN": {"VALUE": 135.22000000000003, "FX": ""}, "TILT": {"VALUE": 106.45, "FX": ""}}}
 32	Circle	{"3001": {"PAN": {"VALUE": null, "FX": "sinus:40:100:10"}, "TILT": {"VALUE": null, "FX": "cosinus:40:100:10"}}, "3002": {"PAN": {"VALUE": null, "FX": "sinus:40:100:10"}, "TILT": {"VALUE": null, "FX": "cosinus:40:100:10"}}, "CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
 33		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
 34		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
 35	Links	{"3001": {"PAN": {"VALUE": 143.44000000000005, "FX": ""}, "TILT": {"VALUE": 40.69000000000001, "FX": ""}}, "3002": {"PAN": {"VALUE": 143.44000000000005, "FX": ""}, "TILT": {"VALUE": 40.69000000000001, "FX": ""}}, "CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
-36	Türe	{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "3001": {"PAN": {"VALUE": 159.8800000000001, "FX": ""}, "TILT": {"VALUE": 205.09000000000026, "FX": "sinus:40:100:10"}}, "3002": {"PAN": {"VALUE": 159.8800000000001, "FX": ""}, "TILT": {"VALUE": 205.09000000000026, "FX": "sinus:40:100:10"}}}
-37		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "3001": {"PAN": {"VALUE": 159.8800000000001, "FX": ""}, "TILT": {"VALUE": 205.09000000000026, "FX": "sinus:40:100:10"}}, "3002": {"PAN": {"VALUE": 159.8800000000001, "FX": ""}, "TILT": {"VALUE": 205.09000000000026, "FX": "sinus:40:100:10"}}}
-38		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
+36	Türe	{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}, "3001": {"PAN": {"VALUE": 159.8800000000001, "FX": ""}, "TILT": {"VALUE": 209.20000000000027, "FX": ""}}, "3002": {"PAN": {"VALUE": 159.8800000000001, "FX": ""}, "TILT": {"VALUE": 209.20000000000027, "FX": ""}}}
+37		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}}
+38		{"CFG": {"FADE": 5, "DEALY": 0, "BUTTON": "GO", "DELAY": 0}}
 39		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
 40		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
 41		{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
@@ -53,7 +53,7 @@
 52	Blue	{"3001": {"RED": {"VALUE": 0, "FX": ""}, "GREEN": {"VALUE": 0, "FX": ""}, "BLUE": {"VALUE": 256, "FX": ""}}, "3002": {"RED": {"VALUE": 0, "FX": ""}, "GREEN": {"VALUE": 0, "FX": ""}, "BLUE": {"VALUE": 256, "FX": ""}}, "CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
 53	Mag	{"3001": {"RED": {"VALUE": 256, "FX": ""}, "GREEN": {"VALUE": 0, "FX": ""}, "BLUE": {"VALUE": 256, "FX": ""}}, "3002": {"RED": {"VALUE": 256, "FX": ""}, "GREEN": {"VALUE": 0, "FX": ""}, "BLUE": {"VALUE": 256, "FX": ""}}, "CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
 54	-	{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
-55	TMH ON	{"3001": {"SHUTTER": {"VALUE": 9.11, "FX": ""}, "VDIM": {"VALUE": 256, "FX": ""}}, "3002": {"SHUTTER": {"VALUE": 9.11, "FX": ""}, "VDIM": {"VALUE": 256, "FX": ""}}, "CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
+55	TMH ON	{"3001": {"SHUTTER": {"VALUE": 9.11, "FX": ""}, "VDIM": {"VALUE": 256, "FX": ""}}, "3002": {"SHUTTER": {"VALUE": 9.11, "FX": ""}, "VDIM": {"VALUE": 256, "FX": ""}}, "CFG": {"BUTTON": null, "FADE": 4, "DELAY": 0}}
 56	-	{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
 57	-	{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}
 58	-	{"CFG": {"BUTTON": "GO", "FADE": 4, "DELAY": 0}}

+ 0 - 0
show/GloryCamp2021X/patch.sav


+ 48 - 0
show/GloryCamp2021X/presets.sav

@@ -0,0 +1,48 @@
+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		{}