Fixes

HakanL · Nov 2, 2020 · fa3c54b · fa3c54b
1 parent 88ebf3c
commit fa3c54b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/Animatroller/src/Framework/Expander/OscServer.cs b/Animatroller/src/Framework/Expander/OscServer.cs
@@ -113,7 +113,7 @@ public OscServer(int listenPort, int forcedClientPort = 0, bool registerAutoHand
                             if (this.receiver.State == Haukcode.Osc.OscSocketState.Connected)
                             {
                                 var packet = this.receiver.Receive();
-                                if (packet == null)
+                                if (Haukcode.Osc.OscPacket.Equals(packet, null))
                                     break;
 
                                 lock (this.clients)

diff --git a/Animatroller/src/Scenes/Halloween2020.cs b/Animatroller/src/Scenes/Halloween2020.cs
@@ -88,7 +88,7 @@ public enum States
         public Halloween2020(IEnumerable<string> args)
         {
             mainSchedule.AddRange("5:00 pm", "10:00 pm");
-            mainSchedule.AddRange("6:30 am", "9:00 am");
+            mainSchedule.AddRange("6:30 am", "8:00 am");
             //    DayOfWeek.Monday, DayOfWeek.Tuesday, DayOfWeek.Wednesday, DayOfWeek.Thursday, DayOfWeek.Sunday);
             //mainSchedule.AddRange("5:00 pm", "9:00 pm",
             //    DayOfWeek.Friday, DayOfWeek.Saturday);
@@ -208,6 +208,7 @@ public Halloween2020(IEnumerable<string> args)
                         bigEyeSender.SendAndRepeat("/eyecontrol", 0);
                     });
 
+            acnOutput.Connect(new Physical.Pixel1D(pixelsFrankGhost, 0, 5), SacnUniverseFrankGhost, 1);
             acnOutput.Connect(new Physical.EliminatorFlash192(flashUnderSpider, 110), SacnUniverseDMXLedmx);
             acnOutput.Connect(new Physical.GenericDimmer(frankGhostAir, 10), SacnUniverseDMXLedmx);
             acnOutput.Connect(new Physical.GenericDimmer(bigSpiderEyes, 256), SacnUniverseDMXLedmx);

diff --git a/Animatroller/src/Scenes/Modules/HalloweenFrankGhost.cs b/Animatroller/src/Scenes/Modules/HalloweenFrankGhost.cs
@@ -10,7 +10,7 @@ namespace Animatroller.Scenes.Modules
 {
     public class HalloweenFrankGhost : TriggeredSubBaseModule
     {
-        Effect.Pulsating pulsatingLow = new Effect.Pulsating(S(4), 0.2, 0.5, false);
+        Effect.Pulsating pulsatingLow = new Effect.Pulsating(S(4), 0.2, 1.0, false);
         Framework.Import.LevelsPlayback levelsPlayback = new Framework.Import.LevelsPlayback();
 
         public HalloweenFrankGhost(
@@ -30,7 +30,7 @@ public HalloweenFrankGhost(
                     LockDevices(air, light);
 
                     air.SetValue(true, token: this.controlToken);
-                    light.SetColor(Color.Red, token: this.controlToken);
+                    light.SetColor(Color.Purple, token: this.controlToken);
                     pulsatingLow.Start(token: this.controlToken);
                 }
                 else

diff --git a/Animatroller/src/Scenes/Modules/HalloweenSpider.cs b/Animatroller/src/Scenes/Modules/HalloweenSpider.cs
@@ -32,19 +32,22 @@ public HalloweenSpider(
                 else
                 {
                     pulsating.Stop();
+
                     UnlockDevices();
                 }
             });
 
+            PowerOn.Loop = true;
+
             PowerOn.RunAction(ins =>
                 {
                     pulsating.Stop();
                     audioPlayer.PlayNewEffect("348 Spider Hiss.wav", 0, 1);
                     spiderEyes?.SetBrightness(1);
                     strobeLight.SetBrightnessStrobeSpeed(1, 1);
-                    ins.WaitFor(S(5.0));
+                    ins.WaitFor(S(4.0));
                     strobeLight.SetBrightnessStrobeSpeed(0, 0);
-                    ins.WaitFor(S(2.0));
+                    ins.WaitFor(S(1.0));
                 })
                 .TearDown(ins =>
                 {