Jelajahi Sumber

Better integration for preheat and related modes

Zachary Kotlarek 12 tahun lalu
induk
melakukan
209ebbddf8
4 mengubah file dengan 27 tambahan dan 24 penghapusan
  1. 3 3
      dmx/leds.pl
  2. 5 5
      dmx/overhead.pl
  3. 11 11
      dmx/rope.pl
  4. 8 5
      dmx/stairs.pl

+ 3 - 3
dmx/leds.pl

@@ -51,9 +51,9 @@ my %DIM            = (
 		{ 'channel' => 15, 'value' => 255, 'time' => 1000 },
 		{ 'channel' => 15, 'value' => 255, 'time' => 1000 },
 	],
 	],
 	'ERROR'    => [
 	'ERROR'    => [
-		{ 'channel' => 13, 'value' => 144, 'time' => 0 },
-		{ 'channel' => 14, 'value' => 255, 'time' => 0 },
-		{ 'channel' => 15, 'value' => 144, 'time' => 0 },
+		{ 'channel' => 13, 'value' => 144, 'time' => 100 },
+		{ 'channel' => 14, 'value' => 255, 'time' => 100 },
+		{ 'channel' => 15, 'value' => 144, 'time' => 100 },
 	],
 	],
 );
 );
 
 

+ 5 - 5
dmx/overhead.pl

@@ -11,12 +11,12 @@ use DMX;
 # User config
 # User config
 my %DIM = (
 my %DIM = (
 	'OFF'       => [ { 'channel' => 4, 'value' => 0,   'time' => 60000 }, ],
 	'OFF'       => [ { 'channel' => 4, 'value' => 0,   'time' => 60000 }, ],
-	'PLAY'      => [ { 'channel' => 4, 'value' => 32,  'time' => 500 }, ],
-	'PLAY_HIGH' => [ { 'channel' => 4, 'value' => 48,  'time' => 500 }, ],
+	'PLAY'      => [ { 'channel' => 4, 'value' => 32,  'time' => 500   }, ],
+	'PLAY_HIGH' => [ { 'channel' => 4, 'value' => 48,  'time' => 500   }, ],
 	'PAUSE'     => [ { 'channel' => 4, 'value' => 96,  'time' => 6000, 'delay' => 9000 }, ],
 	'PAUSE'     => [ { 'channel' => 4, 'value' => 96,  'time' => 6000, 'delay' => 9000 }, ],
-	'MOTION'    => [ { 'channel' => 4, 'value' => 128, 'time' => 2500 }, ],
-	'BRIGHT'    => [ { 'channel' => 4, 'value' => 255, 'time' => 2500 }, ],
-	'ERROR'     => [ { 'channel' => 4, 'value' => 255, 'time' => 0 }, ],
+	'MOTION'    => [ { 'channel' => 4, 'value' => 128, 'time' => 2500  }, ],
+	'BRIGHT'    => [ { 'channel' => 4, 'value' => 255, 'time' => 2500  }, ],
+	'ERROR'     => [ { 'channel' => 4, 'value' => 255, 'time' => 100   }, ],
 );
 );
 
 
 # App config
 # App config

+ 11 - 11
dmx/rope.pl

@@ -56,11 +56,11 @@ my %DIM = (
 		{ 'channel' => 9,  'value' => 96,  'time' => 1500 },
 		{ 'channel' => 9,  'value' => 96,  'time' => 1500 },
 	],
 	],
 	'PREMOTION' => [
 	'PREMOTION' => [
-		{ 'channel' => 1,  'value' => 72,  'time' => 2500 },
-		{ 'channel' => 2,  'value' => 48,  'time' => 2500 },
-		{ 'channel' => 5,  'value' => 48,  'time' => 2500 },
+		{ 'channel' => 1,  'value' => 48,  'time' => 2500 },
+		{ 'channel' => 2,  'value' => 32,  'time' => 2500 },
+		{ 'channel' => 5,  'value' => 32,  'time' => 2500 },
 		{ 'channel' => 6,  'value' => 0,   'time' => 2500 },
 		{ 'channel' => 6,  'value' => 0,   'time' => 2500 },
-		{ 'channel' => 7,  'value' => 48,  'time' => 2500 },
+		{ 'channel' => 7,  'value' => 32,  'time' => 2500 },
 		{ 'channel' => 8,  'value' => 0,   'time' => 2500 },
 		{ 'channel' => 8,  'value' => 0,   'time' => 2500 },
 		{ 'channel' => 9,  'value' => 0,   'time' => 2500 },
 		{ 'channel' => 9,  'value' => 0,   'time' => 2500 },
 	],
 	],
@@ -74,13 +74,13 @@ my %DIM = (
 		{ 'channel' => 9,  'value' => 255, 'time' => 1500 },
 		{ 'channel' => 9,  'value' => 255, 'time' => 1500 },
 	],
 	],
 	'ERROR'    => [
 	'ERROR'    => [
-		{ 'channel' => 1,  'value' => 0,   'time' => 0 },
-		{ 'channel' => 2,  'value' => 0,   'time' => 0 },
-		{ 'channel' => 5,  'value' => 0,   'time' => 0 },
-		{ 'channel' => 6,  'value' => 0,   'time' => 0 },
-		{ 'channel' => 7,  'value' => 0,   'time' => 0 },
-		{ 'channel' => 8,  'value' => 0,   'time' => 0 },
-		{ 'channel' => 9,  'value' => 0,   'time' => 0 },
+		{ 'channel' => 1,  'value' => 0,   'time' => 100 },
+		{ 'channel' => 2,  'value' => 0,   'time' => 100 },
+		{ 'channel' => 5,  'value' => 0,   'time' => 100 },
+		{ 'channel' => 6,  'value' => 0,   'time' => 100 },
+		{ 'channel' => 7,  'value' => 0,   'time' => 100 },
+		{ 'channel' => 8,  'value' => 0,   'time' => 100 },
+		{ 'channel' => 9,  'value' => 0,   'time' => 100 },
 	],
 	],
 );
 );
 
 

+ 8 - 5
dmx/stairs.pl

@@ -11,11 +11,12 @@ use DMX;
 # User config
 # User config
 my $MOTION_TIMEOUT = 30;
 my $MOTION_TIMEOUT = 30;
 my %DIM            = (
 my %DIM            = (
-	'OFF'    => [ { 'channel' => 3, 'value' => 0,   'time' => 60000 }, ],
-	'PLAY'   => [ { 'channel' => 3, 'value' => 80,  'time' => 5000 }, ],
-	'MOTION' => [ { 'channel' => 3, 'value' => 192, 'time' => 750 }, ],
-	'BRIGHT' => [ { 'channel' => 3, 'value' => 255, 'time' => 1000 }, ],
-	'ERROR'  => [ { 'channel' => 3, 'value' => 255, 'time' => 0 }, ],
+	'OFF'       => [ { 'channel' => 3, 'value' => 0,   'time' => 60000 }, ],
+	'PLAY'      => [ { 'channel' => 3, 'value' => 80,  'time' => 5000  }, ],
+	'PREMOTION' => [ { 'channel' => 3, 'value' => 32,  'time' => 2500  }, ],
+	'MOTION'    => [ { 'channel' => 3, 'value' => 192, 'time' => 750   }, ],
+	'BRIGHT'    => [ { 'channel' => 3, 'value' => 255, 'time' => 1000  }, ],
+	'ERROR'     => [ { 'channel' => 3, 'value' => 255, 'time' => 100   }, ],
 );
 );
 
 
 # App config
 # App config
@@ -84,6 +85,8 @@ while (1) {
 		$newState = 'MOTION';
 		$newState = 'MOTION';
 	} elsif ($newState eq 'PAUSE') {
 	} elsif ($newState eq 'PAUSE') {
 		$newState = 'PLAY';
 		$newState = 'PLAY';
+	} elsif ($newState eq 'MOTION') {
+		$newState = 'PREMOTION';
 	} else {
 	} else {
 		$newState = 'OFF';
 		$newState = 'OFF';
 	}
 	}