Zachary Kotlarek 13 лет назад
Родитель
Сommit
1f33bbb8cc
7 измененных файлов с 27 добавлено и 50 удалено
  1. 3 0
      dmx/amplifierPower.pl
  2. 4 12
      dmx/bias.pl
  3. 2 6
      dmx/fan.pl
  4. 4 8
      dmx/garage.pl
  5. 5 15
      dmx/overhead.pl
  6. 1 1
      dmx/projectorPower.pl
  7. 8 8
      dmx/state.pl

+ 3 - 0
dmx/amplifierPower.pl

@@ -80,6 +80,7 @@ while (1) {
 
 	# Force updates on a periodic basis
 	if (time() - $pushLast > $PUSH_TIMEOUT) {
+
 		# Not for the amp
 		#$update = 1;
 	}
@@ -119,6 +120,7 @@ while (1) {
 
 		# Reset to TV @ 5.1 at power on
 		if (defined($cmd) && $cmd eq 'ON') {
+
 			# Set the audio source back to the default
 			my @CMD = @AUDIO_SET;
 			push(@CMD, $DEFAULT_DEV);
@@ -136,6 +138,7 @@ while (1) {
 
 		# Rave through the main amp
 		if ($state eq 'RAVE') {
+
 			# Set the audio source to the RAVE device
 			my @CMD = @AUDIO_SET;
 			push(@CMD, $RAVE_DEV);

+ 4 - 12
dmx/bias.pl

@@ -10,18 +10,10 @@ use DMX;
 
 # User config
 my %DIM = (
-	'OFF'    => [
-		{ 'channel' => 12, 'value' => 0,   'time' => 60000 },
-	],
-	'PLAY'   => [
-		{ 'channel' => 12, 'value' => 255, 'time' => 0 }
-	],
-	'PAUSE'   => [
-		{ 'channel' => 12, 'value' => 0,  'time' => 0, 'delay' => 10000 }
-	],
-	'MOTION'  => [
-		{ 'channel' => 12, 'value' => 0,  'time' => 0 }
-	],
+	'OFF'    => [ { 'channel' => 12, 'value' => 0,   'time' => 60000 }, ],
+	'PLAY'   => [ { 'channel' => 12, 'value' => 255, 'time' => 0 } ],
+	'PAUSE'  => [ { 'channel' => 12, 'value' => 0,   'time' => 0, 'delay' => 10000 } ],
+	'MOTION' => [ { 'channel' => 12, 'value' => 0,   'time' => 0 } ],
 );
 
 # App config

+ 2 - 6
dmx/fan.pl

@@ -10,12 +10,8 @@ use DMX;
 
 # User config
 my %DIM = (
-	'OFF'    => [
-		{ 'channel' => 11, 'value' => 0,   'time' => 0 }
-	],
-	'ON'    => [
-		{ 'channel' => 11, 'value' => 255, 'time' => 0 }
-	],
+	'OFF' => [ { 'channel' => 11, 'value' => 0,   'time' => 0 } ],
+	'ON'  => [ { 'channel' => 11, 'value' => 255, 'time' => 0 } ],
 );
 
 # App config

+ 4 - 8
dmx/garage.pl

@@ -10,14 +10,10 @@ use lib dirname(abs_path($0));
 use DMX;
 
 # User config
-my $RELAY_DELAY  = 0.20;
-my %DIM          = (
-	'OFF'      => [
-		{ 'channel' => 16, 'value' => 0,   'time' => 0 }
-	],
-	'ACTIVATE' => [
-		{ 'channel' => 16, 'value' => 255, 'time' => 0 }
-	],
+my $RELAY_DELAY = 0.20;
+my %DIM         = (
+	'OFF'      => [ { 'channel' => 16, 'value' => 0,   'time' => 0 } ],
+	'ACTIVATE' => [ { 'channel' => 16, 'value' => 255, 'time' => 0 } ],
 );
 
 # App config

+ 5 - 15
dmx/overhead.pl

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

+ 1 - 1
dmx/projectorPower.pl

@@ -103,6 +103,7 @@ while (1) {
 
 	# Force updates on a periodic basis
 	if (time() - $pushLast > $PUSH_TIMEOUT) {
+
 		# Not for the projector
 		#$update = 1;
 	}
@@ -143,7 +144,6 @@ while (1) {
 		$update = 0;
 	}
 
-
 	# Announce a pending shutdown every minute
 	if ($state eq 'COUNTDOWN') {
 		my $timeLeft = ($TIMEOUT + $COUNTDOWN) - $elapsed;

+ 8 - 8
dmx/state.pl

@@ -18,14 +18,14 @@ sub mtime($);
 # User config
 my $STATE_TIMEOUT = 180;
 my %MON_FILES     = (
-	'GUI'         => 'MTIME',
-	'MOTION'      => 'MTIME',
-	'PROJECTOR'   => 'STATUS',
-	'AMPLIFIER'   => 'STATUS_NOMTIME',
-	'PLAYING'     => 'PLAYING',
-	'LIGHTS'      => 'EXISTS',
-	'FAN_CMD'     => 'EXISTS',
-	'RAVE'        => 'EXISTS_OFF',
+	'GUI'       => 'MTIME',
+	'MOTION'    => 'MTIME',
+	'PROJECTOR' => 'STATUS',
+	'AMPLIFIER' => 'STATUS_NOMTIME',
+	'PLAYING'   => 'PLAYING',
+	'LIGHTS'    => 'EXISTS',
+	'FAN_CMD'   => 'EXISTS',
+	'RAVE'      => 'EXISTS_OFF',
 
 	'/mnt/media/DMX/cmd/GARAGE_CMD' => 'EXISTS_CLEAR',
 );