Explorar o código

Consolidate PLAY and PREMOTION states

Zachary Kotlarek %!s(int64=12) %!d(string=hai) anos
pai
achega
ee98745b1b
Modificáronse 1 ficheiros con 1 adicións e 4 borrados
  1. 1 4
      dmx/stairs.pl

+ 1 - 4
dmx/stairs.pl

@@ -12,7 +12,6 @@ use DMX;
 my $MOTION_TIMEOUT = 30;
 my $MOTION_TIMEOUT = 30;
 my %DIM            = (
 my %DIM            = (
 	'OFF'       => [ { 'channel' => 3, 'value' => 0,   'time' => 60000 }, ],
 	'OFF'       => [ { 'channel' => 3, 'value' => 0,   'time' => 60000 }, ],
-	'PLAY'      => [ { 'channel' => 3, 'value' => 80,  'time' => 5000  }, ],
 	'PREMOTION' => [ { 'channel' => 3, 'value' => 32,  'time' => 2500  }, ],
 	'PREMOTION' => [ { 'channel' => 3, 'value' => 32,  'time' => 2500  }, ],
 	'MOTION'    => [ { 'channel' => 3, 'value' => 192, 'time' => 750   }, ],
 	'MOTION'    => [ { 'channel' => 3, 'value' => 192, 'time' => 750   }, ],
 	'BRIGHT'    => [ { 'channel' => 3, 'value' => 255, 'time' => 1000  }, ],
 	'BRIGHT'    => [ { 'channel' => 3, 'value' => 255, 'time' => 1000  }, ],
@@ -83,9 +82,7 @@ while (1) {
 		$newState = 'BRIGHT';
 		$newState = 'BRIGHT';
 	} elsif ($mtime{'MOTION_STAIRS'} > time() - $MOTION_TIMEOUT) {
 	} elsif ($mtime{'MOTION_STAIRS'} > time() - $MOTION_TIMEOUT) {
 		$newState = 'MOTION';
 		$newState = 'MOTION';
-	} elsif ($newState eq 'PAUSE') {
-		$newState = 'PLAY';
-	} elsif ($newState eq 'MOTION') {
+	} elsif ($newState eq 'PLAY' || $newState eq 'PAUSE' || $newState eq 'MOTION') {
 		$newState = 'PREMOTION';
 		$newState = 'PREMOTION';
 	} else {
 	} else {
 		$newState = 'OFF';
 		$newState = 'OFF';