Bläddra i källkod

add: EXEC FL OUT-FADE ... ok

micha 1 år sedan
förälder
incheckning
47af1b29bd
2 ändrade filer med 11 tillägg och 2 borttagningar
  1. 10 1
      _LibreLightDesk.py
  2. 1 1
      _console.py

+ 10 - 1
_LibreLightDesk.py

@@ -2981,13 +2981,22 @@ class MASTER():
             xfade = 0
             if type(val) is not type(None) and val == 0 :
                 value = "off"
+                xfade=0
+                if "OUT-FADE" in cfg:
+                    xfade=cfg["OUT-FADE"]
             if event:
                 if str(event.type) == "ButtonRelease" or event.type == '5' :
                     value = "off"
+                    xfade=0
+                    if "OUT-FADE" in cfg:
+                        xfade=cfg["OUT-FADE"]
+
 
             cprint("preset_go() FLUSH",value,color="red")
-            
+            #print(";",rdata)
+            print(";",cfg)
             fcmd  = FIXTURES.update_raw(rdata,update=0)
+            #print(":",fcmd) # raw dmx
             self._preset_go(rdata,cfg,fcmd,value,xfade=xfade,xFLASH=xFLASH,nr=nr)
                 
         elif not val:

+ 1 - 1
_console.py

@@ -612,7 +612,7 @@ class DMXCH(object):
                 cur_val = self._flash.next()
                 #cur_tar = self._fade.next()
                 cur_tar = self._base_value
-                self._flash = Fade(cur_val,cur_tar,ftime=0.0,clock=clock) 
+                self._flash = Fade(cur_val,cur_tar,ftime=ftime,clock=clock) 
                 self._flash.off = 1
         else:#elif target != self._base_value:
             try: