|
|
@@ -25,7 +25,7 @@ my %DIM = (
|
|
|
'OFF' => [
|
|
|
{ 'channel' => 0, 'value' => 0, 'time' => 60000 }
|
|
|
],
|
|
|
- 'PLAY' => [
|
|
|
+ 'PLAY' => [
|
|
|
{ 'channel' => 1, 'value' => 64, 'time' => 500 },
|
|
|
{ 'channel' => 2, 'value' => 32, 'time' => 500 },
|
|
|
{ 'channel' => 3, 'value' => 80, 'time' => 1500 },
|
|
|
@@ -34,16 +34,25 @@ my %DIM = (
|
|
|
{ 'channel' => 7, 'value' => 32, 'time' => 500 },
|
|
|
{ 'channel' => 8, 'value' => 16, 'time' => 500 },
|
|
|
],
|
|
|
- 'PAUSE' => [
|
|
|
+ 'PLAY_HIGH' => [
|
|
|
+ { 'channel' => 1, 'value' => 192, 'time' => 500 },
|
|
|
+ { 'channel' => 2, 'value' => 128, 'time' => 500 },
|
|
|
+ { 'channel' => 3, 'value' => 192, 'time' => 1500 },
|
|
|
+ { 'channel' => 5, 'value' => 192, 'time' => 500 },
|
|
|
+ { 'channel' => 6, 'value' => 36, 'time' => 500 },
|
|
|
+ { 'channel' => 7, 'value' => 128, 'time' => 500 },
|
|
|
+ { 'channel' => 8, 'value' => 16, 'time' => 500 },
|
|
|
+ ],
|
|
|
+ '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' => 13000 },
|
|
|
+ { 'channel' => 6, 'value' => 104, 'time' => 12000 },
|
|
|
{ 'channel' => 7, 'value' => 192, 'time' => 10000 },
|
|
|
- { 'channel' => 8, 'value' => 92, 'time' => 18000 },
|
|
|
+ { 'channel' => 8, 'value' => 92, 'time' => 16000 },
|
|
|
],
|
|
|
- 'MOTION' => [
|
|
|
+ 'MOTION' => [
|
|
|
{ 'channel' => 1, 'value' => 255, 'time' => 1000 },
|
|
|
{ 'channel' => 2, 'value' => 192, 'time' => 1000 },
|
|
|
{ 'channel' => 3, 'value' => 192, 'time' => 1000 },
|
|
|
@@ -92,6 +101,7 @@ my $state = 'INIT';
|
|
|
my $stateLast = $state;
|
|
|
my $playing = 0;
|
|
|
my $projector = 0;
|
|
|
+my $lights = 0;
|
|
|
my $updateLast = 0;
|
|
|
|
|
|
# Always force lights out at launch
|
|
|
@@ -144,6 +154,22 @@ while (1) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ # Monitor the LIGHTS file for presence
|
|
|
+ {
|
|
|
+ $lights = 0;
|
|
|
+ if (-e $DATA_DIR . 'LIGHTS') {
|
|
|
+ $lights = 1;
|
|
|
+ }
|
|
|
+ if ($DEBUG) {
|
|
|
+ print STDERR 'Lights: ' . $lights . "\n";
|
|
|
+ }
|
|
|
+
|
|
|
+ # Clear the override when the projector is off
|
|
|
+ if ($lights && !$projector) {
|
|
|
+ unlink($DATA_DIR . 'LIGHTS');
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
# Monitor the GUI, PLAYING, and MOTION files for changes only
|
|
|
{
|
|
|
my $mtime = mtime($DATA_DIR . 'PLAYING');
|
|
|
@@ -166,7 +192,13 @@ while (1) {
|
|
|
|
|
|
# We are always either playing or paused if the projector is on
|
|
|
if ($playing) {
|
|
|
- $state = 'PLAY';
|
|
|
+
|
|
|
+ # Allow an override to higher brightness during playback
|
|
|
+ if ($lights) {
|
|
|
+ $state = 'PLAY_HIGH';
|
|
|
+ } else {
|
|
|
+ $state = 'PLAY';
|
|
|
+ }
|
|
|
} else {
|
|
|
$state = 'PAUSE';
|
|
|
}
|