Use the new separate motion bits

dmx/launchd/com.uberzach.ola.stairs.plist

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>LimitLoadToSessionType</key>
+	<string>Aqua</string>
+	<key>LimitLoadToHosts</key>
+	<array>
+		<string>Loki.local</string>
+		<string>loki.uberzach.com</string>
+	</array>
+	<key>RunAtLoad</key>
+	<true/>
+	<key>Label</key>
+	<string>com.uberzach.ola.stairs</string>
+	<key>KeepAlive</key>
+	<dict>
+		<key>OtherJobEnabled</key>
+		<dict>
+			<key>com.uberzach.ola.dmx</key>
+			<true/>
+			<key>com.uberzach.state</key>
+			<true/>
+		</dict>
+	</dict>
+	<key>ProgramArguments</key>
+	<array>
+		<string>/Users/tv/bin/video/dmx/stairs.pl</string>
+	</array>
+</dict>
+</plist>

dmx/rope.pl

@@ -13,7 +13,6 @@ my %DIM = (
 	'OFF'    => [
 		{ 'channel' => 1,  'value' => 0,   'time' => 60000 },
 		{ 'channel' => 2,  'value' => 0,   'time' => 60000 },
-		{ 'channel' => 3,  'value' => 0,   'time' => 60000 },
 		{ 'channel' => 5,  'value' => 0,   'time' => 60000 },
 		{ 'channel' => 6,  'value' => 0,   'time' => 60000 },
 		{ 'channel' => 7,  'value' => 0,   'time' => 60000 },
@@ -23,7 +22,6 @@ my %DIM = (
 	'PLAY'      => [
 		{ 'channel' => 1,  'value' => 64,  'time' => 500   },
 		{ 'channel' => 2,  'value' => 32,  'time' => 500   },
-		{ 'channel' => 3,  'value' => 80,  'time' => 2500  },
 		{ 'channel' => 5,  'value' => 64,  'time' => 500   },
 		{ 'channel' => 6,  'value' => 36,  'time' => 500   },
 		{ 'channel' => 7,  'value' => 32,  'time' => 500   },
@@ -33,7 +31,6 @@ my %DIM = (
 	'PLAY_HIGH' => [
 		{ 'channel' => 1,  'value' => 255, 'time' => 500   },
 		{ 'channel' => 2,  'value' => 128, 'time' => 500   },
-		{ 'channel' => 3,  'value' => 192, 'time' => 1500  },
 		{ 'channel' => 5,  'value' => 128, 'time' => 500   },
 		{ 'channel' => 6,  'value' => 36,  'time' => 500   },
 		{ 'channel' => 7,  'value' => 128, 'time' => 500   },
@@ -43,7 +40,6 @@ my %DIM = (
 	'PAUSE'     => [
 		{ 'channel' => 1,  'value' => 255, 'time' => 1000  },
 		{ 'channel' => 2,  'value' => 192, 'time' => 10000 },
-		{ 'channel' => 3,  'value' => 192, 'time' => 5000  },
 		{ 'channel' => 5,  'value' => 255, 'time' => 1000  },
 		{ 'channel' => 6,  'value' => 104, 'time' => 6000, 'delay' => 3000 },
 		{ 'channel' => 7,  'value' => 192, 'time' => 10000 },
@@ -53,7 +49,6 @@ my %DIM = (
 	'MOTION'    => [
 		{ 'channel' => 1,  'value' => 255, 'time' => 1000  },
 		{ 'channel' => 2,  'value' => 192, 'time' => 1000  },
-		{ 'channel' => 3,  'value' => 192, 'time' => 1000  },
 		{ 'channel' => 5,  'value' => 192, 'time' => 1000  },
 		{ 'channel' => 6,  'value' => 104, 'time' => 1000  },
 		{ 'channel' => 7,  'value' => 192, 'time' => 1000  },
@@ -63,7 +58,6 @@ my %DIM = (
 	'BRIGHT'    => [
 		{ 'channel' => 1,  'value' => 255, 'time' => 1000  },
 		{ 'channel' => 2,  'value' => 255, 'time' => 1000  },
-		{ 'channel' => 3,  'value' => 255, 'time' => 1000  },
 		{ 'channel' => 5,  'value' => 255, 'time' => 1000  },
 		{ 'channel' => 6,  'value' => 255, 'time' => 1000  },
 		{ 'channel' => 7,  'value' => 255, 'time' => 1000  },
@@ -73,7 +67,6 @@ my %DIM = (
 	'ERROR'    => [
 		{ 'channel' => 1,  'value' => 0,   'time' => 0  },
 		{ 'channel' => 2,  'value' => 0,   'time' => 0  },
-		{ 'channel' => 3,  'value' => 255, 'time' => 0  },
 		{ 'channel' => 5,  'value' => 0,   'time' => 0  },
 		{ 'channel' => 6,  'value' => 0,   'time' => 0  },
 		{ 'channel' => 7,  'value' => 0,   'time' => 0  },

dmx/stairs.pl

@@ -0,0 +1,137 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+
+# Local modules
+use Cwd qw(abs_path);
+use File::Basename qw(dirname);
+use lib dirname(abs_path($0));
+use DMX;
+
+# User config
+my $MOTION_TIMEOUT = 15;
+my %DIM = (
+	'OFF'    => [
+		{ 'channel' => 3,  'value' => 0,   'time' => 60000 },
+	],
+	'PLAY'      => [
+		{ 'channel' => 3,  'value' => 80,  'time' => 5000  },
+	],
+	'MOTION'    => [
+		{ 'channel' => 3,  'value' => 192, 'time' => 500  },
+	],
+	'BRIGHT'    => [
+		{ 'channel' => 3,  'value' => 255, 'time' => 1000  },
+	],
+	'ERROR'    => [
+		{ 'channel' => 3,  'value' => 255, 'time' => 0  },
+	],
+);
+
+# App config
+my $DATA_DIR     = DMX::dataDir();
+my $STATE_SOCK   = 'STAIRS';
+my $OUTPUT_FILE  = $DATA_DIR . $STATE_SOCK;
+my $PUSH_TIMEOUT = 20;
+my $PULL_TIMEOUT = $PUSH_TIMEOUT * 3;
+my $DELAY        = $PULL_TIMEOUT / 2;
+
+# Debug
+my $DEBUG = 0;
+if ($ENV{'DEBUG'}) {
+	$DEBUG = 1;
+}
+
+# Construct a list of valid states
+my %VALID = ();
+foreach my $key (keys(%DIM)) {
+	$VALID{$key} = 1;
+}
+$VALID{'PAUSE'} = 1;
+
+# State
+my $state     = 'OFF';
+my $stateLast = $state;
+my %exists    = ();
+my %mtime     = ();
+my $pushLast  = 0;
+my $pullLast  = time();
+my $update    = 0;
+
+# Always force lights into ERROR at launch
+$state = 'ERROR';
+DMX::applyDataset($DIM{$state}, $state, $OUTPUT_FILE);
+
+# Sockets
+DMX::stateSocket($STATE_SOCK);
+DMX::stateSubscribe($STATE_SOCK);
+
+# Loop forever
+while (1) {
+
+	# State is calculated; use newState to gather data
+	my $newState = $state;
+
+	# Wait for state updates
+	my $cmdState = DMX::readState($DELAY, \%exists, \%mtime, \%VALID);
+	if (defined($cmdState)) {
+		$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");
+	}
+
+	# Skip processing when in RAVE or EFFECT mode
+	if ($exists{'RAVE'} || $exists{'EFFECT'}) {
+		if ($DEBUG) {
+			print STDERR "Suspending normal operation while in RAVE mode\n";
+		}
+		$update = 1;
+		next;
+	}
+
+	# Calculate the new state
+	$stateLast = $state;
+	if ($exists{'BRIGHT'}) {
+		$newState = 'BRIGHT';
+	} elsif ($exists{'MOTION_STAIRS'} || $mtime{'MOTION_STAIRS'} > time() - $MOTION_TIMEOUT) {
+		$newState = 'MOTION';
+	} elsif ($newState eq 'PAUSE') {
+		$newState = 'PLAY';
+	} else {
+		$newState = 'OFF';
+	}
+	$state = $newState;
+
+	# Force updates on a periodic basis
+	if (!$update && time() - $pushLast > $PUSH_TIMEOUT) {
+		if ($DEBUG) {
+			print STDERR "Forcing periodic update\n";
+		}
+		$update = 1;
+	}
+
+	# Force updates on any state change
+	if (!$update && $stateLast ne $state) {
+		if ($DEBUG) {
+			print STDERR 'State change: ' . $stateLast . ' => ' . $state . "\n";
+		}
+		$update = 1;
+	}
+
+	# Update the lighting
+	if ($update) {
+
+		# Update
+		DMX::applyDataset($DIM{$state}, $state, $OUTPUT_FILE);
+
+		# Update the push time
+		$pushLast = time();
+
+		# Clear the update flag
+		$update = 0;
+	}
+}

dmx/state.pl

@@ -54,8 +54,9 @@ if ($HOST =~ /loki/i) {
 	$MON_FILES{'RIFF'} = 'VALUE-NOUPDATE';
 
 	# Motion detection
-	$MON_FILES{'MOTION'}    = 'MTIME';
-	$MON_FILES{'NO_MOTION'} = 'EXISTS-NOUPDATE';
+	$MON_FILES{'MOTION'}        = 'MTIME';
+	$MON_FILES{'MOTION_STAIRS'} = 'MTIME';
+	$MON_FILES{'NO_MOTION'}     = 'EXISTS-NOUPDATE';
 
 	# Projector
 	$MON_FILES{'PROJECTOR'}       = 'STATUS';