Zachary Kotlarek 13 years ago
parent
commit
66a89e67dd
6 changed files with 18 additions and 23 deletions
  1. 2 2
      dmx/DMX.pm
  2. 4 4
      dmx/audioOutput.pl
  3. 3 3
      dmx/debug.pl
  4. 1 1
      dmx/fan.pl
  5. 1 1
      dmx/state.pl
  6. 7 12
      serial/serial.pl

+ 2 - 2
dmx/DMX.pm

@@ -117,11 +117,11 @@ sub parseState($$$) {
 	my $exists_text = undef();
 	if (!defined($exists)) {
 		my %tmp = ();
-		$exists  = \%tmp;
+		$exists = \%tmp;
 	}
 	if (!defined($mtime)) {
 		my %tmp = ();
-		$mtime  = \%tmp;
+		$mtime = \%tmp;
 	}
 
 	# Parse the string

+ 4 - 4
dmx/audioOutput.pl

@@ -12,10 +12,10 @@ use lib dirname(abs_path($0));
 use DMX;
 
 # App config
-my $DATA_DIR     = DMX::dataDir();
-my $OUTPUT_FILE  = $DATA_DIR . 'AUDIO_OUTPUT';
-my $DELAY        = 1;
-my @AUDIO_GET    = ('/Users/tv/bin/SwitchAudioSource', '-c');
+my $DATA_DIR    = DMX::dataDir();
+my $OUTPUT_FILE = $DATA_DIR . 'AUDIO_OUTPUT';
+my $DELAY       = 1;
+my @AUDIO_GET   = ('/Users/tv/bin/SwitchAudioSource', '-c');
 
 # Debug
 my $DEBUG = 0;

+ 3 - 3
dmx/debug.pl

@@ -12,12 +12,12 @@ use lib dirname(abs_path($0));
 use DMX;
 
 # User config
-my %DIM = ();
+my %DIM   = ();
 my $DELAY = 10;
 
 # App config
-my $DATA_DIR     = DMX::dataDir();
-my $STATE_SOCK   = $DATA_DIR . 'DEBUG.socket';
+my $DATA_DIR   = DMX::dataDir();
+my $STATE_SOCK = $DATA_DIR . 'DEBUG.socket';
 
 # Sockets
 DMX::stateSocket($STATE_SOCK);

+ 1 - 1
dmx/fan.pl

@@ -55,7 +55,7 @@ while (1) {
 		$newState = $cmdState;
 		$pullLast = time();
 	}
-	
+
 	# Die if we don't see regular updates
 	if (time() - $pullLast > $PULL_TIMEOUT) {
 		die('No update on state socket in past ' . $PULL_TIMEOUT . " seconds. Exiting...\n");

+ 1 - 1
dmx/state.pl

@@ -274,7 +274,7 @@ while (1) {
 		foreach my $file (values(%files)) {
 			push(@statTime, $file->{'name'} . ':' . $file->{'status'} . ':' . $file->{'update'});
 		}
-		$status      = ' (' . join(', ', @statTime) . ')';
+		$status = ' (' . join(', ', @statTime) . ')';
 	}
 
 	# Clear EXISTS_CLEAR files immediately (but after we append their status)

+ 7 - 12
serial/serial.pl

@@ -34,9 +34,7 @@ if (basename($0) =~ /PROJECTOR/i) {
 		'OFF'    => 'PWR OFF',
 		'STATUS' => 'PWR?'
 	);
-	%STATUS_CMDS = (
-		'STATUS' => { 'EQUAL' => 'PWR=01' },
-	);
+	%STATUS_CMDS = ('STATUS' => { 'EQUAL' => 'PWR=01' },);
 } elsif (basename($0) =~ /AMPLIFIER/i) {
 	$DEV       = 'Amplifier';
 	$PORT      = '/dev/tty.usbserial-A5006x9u';
@@ -64,10 +62,10 @@ if (basename($0) =~ /PROJECTOR/i) {
 
 	);
 	%STATUS_CMDS = (
-		'STATUS' => { 'EQUAL'    => $CMDS{'ON'} },
-		'MODE'   => { 'EVAL'     => 'if ($a =~ /STEREO/i) { $a = "STEREO" } elsif ($a =~ /MSDOLBY/i) { $a = "SURROUND" } else { $a = "UNKNOWN" }' },
-		'VOL'    => { 'EVAL'     => '$a =~ s/^MV//; if (length($a) > 2) { $a =~ s/(\d\d)(\d)/$1.$2/ }'},
-		'INPUT'  => { 'REPLACE'  => qr/^SI(.*)/},
+		'STATUS' => { 'EQUAL'   => $CMDS{'ON'} },
+		'MODE'   => { 'EVAL'    => 'if ($a =~ /STEREO/i) { $a = "STEREO" } elsif ($a =~ /MSDOLBY/i) { $a = "SURROUND" } else { $a = "UNKNOWN" }' },
+		'VOL'    => { 'EVAL'    => '$a =~ s/^MV//; if (length($a) > 2) { $a =~ s/(\d\d)(\d)/$1.$2/ }' },
+		'INPUT'  => { 'REPLACE' => qr/^SI(.*)/ },
 	);
 } elsif (basename($0) =~ /TV/i) {
 	$DEV       = 'TV';
@@ -93,9 +91,7 @@ if (basename($0) =~ /PROJECTOR/i) {
 		'VOL+'      => 'VOLM',
 		'VOL-'      => 'VOLM'
 	);
-	%STATUS_CMDS = (
-		'STATUS' => { 'EQUAL' => '1' },
-	);
+	%STATUS_CMDS = ('STATUS' => { 'EQUAL' => '1' },);
 } else {
 	die("No device specified\n");
 }
@@ -115,7 +111,6 @@ if ($ENV{'DEBUG'}) {
 	print STDERR "Debug enabled\n";
 }
 
-
 # Command-line arguments
 my ($DELAY) = @ARGV;
 if (!$DELAY) {
@@ -151,7 +146,7 @@ sendQuery($port, $CMDS{'INIT'});
 
 # State
 my $lastStatus = 0;
-my %STATUS = ();
+my %STATUS     = ();
 foreach my $cmd (keys(%STATUS_CMDS)) {
 	my %tmp = ('status' => 0, 'last' => 0);
 	$tmp{'path'} = $DATA_DIR . uc($DEV);