Read the LAMP hours

dmx/state.pl

@@ -39,6 +39,7 @@ my %MON_FILES     = ();
 	$MON_FILES{'PROJECTOR'}       = 'STATUS';
 	$MON_FILES{'PROJECTOR_COLOR'} = 'STATUS_VALUE';
 	$MON_FILES{'PROJECTOR_INPUT'} = 'STATUS_VALUE';
+	$MON_FILES{'PROJECTOR_LAMP'}  = 'STATUS_VALUE';
 
 	# Amplifier
 	$MON_FILES{'AMPLIFIER'}       = 'STATUS';
@@ -234,11 +235,10 @@ while (1) {
 		$file->{'status'} = 0;
 
 		# Track available/unavailable files
-		if (!$file->{'type'} =~ /^EXISTS/) {
+		if (!($file->{'type'} =~ /^EXISTS/)) {
 			my $wasAvailable = $file->{'available'};
 			$file->{'available'} = -r $file->{'path'} ? 1 : 0;
 			if ($wasAvailable != $file->{'available'}) {
-
 				# Reset and extras for this file
 				if (exists($EXTRAS{ $file->{'name'} })) {
 					foreach my $extra (keys(%{ $EXTRAS{ $file->{'name'} } })) {

serial/serial.pl

@@ -45,11 +45,13 @@ if (basename($0) =~ /PROJECTOR/i) {
 		'HDMI_2'          => 'SOURCE A0',
 		'VGA'             => 'SOURCE 20',
 		'INPUT'           => 'SOURCE?',
+		'LAMP'            => 'LAMP?',
 	);
 	%STATUS_CMDS = (
-		'STATUS' => { 'MATCH' => [ qr/^PWR=/,                 qr/PWR=01/ ] },
-		'COLOR'  => { 'EVAL'  => [ qr/^CMODE=[0-9A-Z]{2}$/i,  'if ($a =~ /06$/i) { $a = "DYNAMIC" } elsif ($a =~ /0C$/i) { $a = "LIVING_ROOM" } elsif ($a =~ /07$/i) { $a = "NATURAL" } elsif ($a =~ /05$/i) { $a = "THEATER" } elsif ($a =~ /09$/i) { $a = "THEATER_BLACK_1" } elsif ($a =~ /0A$/i) { $a = "THEATER_BLACK_2" } elsif ($a =~ /0B$/i) { $a = "XV" }' ] },
-		'INPUT'  => { 'EVAL'  => [ qr/^SOURCE=[0-9A-Z]{2}$/i, 'if ($a =~ /30$/i) { $a = "HDMI_1" } elsif ($a =~ /A0$/i) { $a = "HDMI_2" } elsif ($a =~ /20$/i) { $a = "VGA" }' ] },
+		'STATUS' => { 'MATCH'   => [ qr/^PWR=/,                 qr/PWR=01/ ] },
+		'COLOR'  => { 'EVAL'    => [ qr/^CMODE=[0-9A-Z]{2}$/i,  'if ($a =~ /06$/i) { $a = "DYNAMIC" } elsif ($a =~ /0C$/i) { $a = "LIVING_ROOM" } elsif ($a =~ /07$/i) { $a = "NATURAL" } elsif ($a =~ /05$/i) { $a = "THEATER" } elsif ($a =~ /09$/i) { $a = "THEATER_BLACK_1" } elsif ($a =~ /0A$/i) { $a = "THEATER_BLACK_2" } elsif ($a =~ /0B$/i) { $a = "XV" }' ] },
+		'INPUT'  => { 'EVAL'    => [ qr/^SOURCE=[0-9A-Z]{2}$/i, 'if ($a =~ /30$/i) { $a = "HDMI_1" } elsif ($a =~ /A0$/i) { $a = "HDMI_2" } elsif ($a =~ /20$/i) { $a = "VGA" }' ] },
+		'LAMP'   => { 'REPLACE' => qr/^LAMP=(\d+)$/i },
 	);
 } elsif (basename($0) =~ /AMPLIFIER/i) {
 	$DEV       = 'Amplifier';