Преглед изворни кода

fix: autostart countdown=dmx

micha пре 2 година
родитељ
комит
919e728c1d
2 измењених фајлова са 16 додато и 6 уклоњено
  1. 2 2
      vpu/autostart.sh
  2. 14 4
      vpu/vpu_live.py

+ 2 - 2
vpu/autostart.sh

@@ -22,10 +22,10 @@ screen -m -d -S ASP -- python3 /opt/LibreLight/ASP/ArtNetProcessor.py
 #screen -m -d -S shader -- python3 /opt/LibreLight/Xdesk/vpu/vpu_live.py -m 16,12,5
 # Ayrton VPU Offset Y ___ Y ___ (Ghost 255)
 #screen -m -d -S vpu1_out -- python3 /opt/LibreLight/Xdesk/vpu/vpu_live.py -m 16,8,8 -X 12 --pixel-map=_1 --gobo-ch=11
-screen -m -d -S vpu1_out -- python3 /opt/LibreLight/Xdesk/vpu/vpu_live.py -m 16,12,5 -X 12 --pixel-map=_1 --gobo-ch=11 --countdown=51,61
+screen -m -d -S vpu1_out -- python3 /opt/LibreLight/Xdesk/vpu/vpu_live.py -m 16,12,5 -X 12 --pixel-map=_1 --gobo-ch=11 --countdown=31,51
 # Ayrton VPU Offset X 235 Y 253 (Pannel 255)  7,5m-4m ... 9,5m-4m
 #screen -m -d -S vpu2_out -- python3 /opt/LibreLight/Xdesk/vpu/vpu_live.py -m 16,8,8 -X 4  --pixel-map=_2 --gobo-ch=21 --win-pos 430,164 --start-univ=4 
-screen -m -d -S vpu2_out -- python3 /opt/LibreLight/Xdesk/vpu/vpu_live.py -m 16,4,6 -X 4  --pixel-map=_2 --gobo-ch=21 --win-pos 430,164 --start-univ=4 --countdown=31,51
+screen -m -d -S vpu2_out -- python3 /opt/LibreLight/Xdesk/vpu/vpu_live.py -m 16,4,6 -X 4  --pixel-map=_2 --gobo-ch=21 --win-pos 430,164 --start-univ=4 --countdown=71,91
 
 sleep 3
 screen -ls

+ 14 - 4
vpu/vpu_live.py

@@ -874,6 +874,16 @@ def reload_grid():
     except Exception as e:
         print("Except: grid re init",e)
 
+VPU_TEXT = []
+def load_vpu_text(nr=0):
+    txt = "NONE"
+    if not VPU_TEXT:
+        pass #create VPU_TEXT_FILE
+    if len(VPU_TEXT) > nr:
+        txt = VPU_TEXT[0]
+    return txt
+
+
 t1 = Timer(143)
 time.sleep(0.33)
 t2 = Timer(11)
@@ -965,13 +975,13 @@ def main():
                             count["_SEC"] = 0
 
                     if count["CONTROL"] >= 60 and count["CONTROL"] < 70:
-                        count["_SEC"] = "HSN"
+                        count["_SEC"] = "HSN" #text 1
                     if count["CONTROL"] >= 70 and count["CONTROL"] < 80:
-                        count["_SEC"] = "LOS"
+                        count["_SEC"] = "LOS" #text 2
                     if count["CONTROL"] >= 80 and count["CONTROL"] < 90:
-                        count["_SEC"] = "GO"
+                        count["_SEC"] = "GO" #text 3
                     if count["CONTROL"] >= 90 and count["CONTROL"] < 100:
-                        count["_SEC"] = "PARTY"
+                        count["_SEC"] = "PARTY" #text 4
                     if count["CONTROL"] >= 250 and count["CONTROL"] < 256:
                         count["_SEC"] = ">{}<".format(cDMX+1)