Forráskód Böngészése

Do not subscribe for state updates

Zachary Kotlarek 11 éve
szülő
commit
7be4e99e32
2 módosított fájl, 4 hozzáadás és 8 törlés
  1. 0 2
      dmx/launchd/com.uberzach.ola.rumble.plist
  2. 4 6
      dmx/rumble.pl

+ 0 - 2
dmx/launchd/com.uberzach.ola.rumble.plist

@@ -14,8 +14,6 @@
 		<dict>
 		<dict>
 			<key>com.uberzach.ola.dmx</key>
 			<key>com.uberzach.ola.dmx</key>
 			<true/>
 			<true/>
-			<key>com.uberzach.state</key>
-			<true/>
 		</dict>
 		</dict>
 	</dict>
 	</dict>
 	<key>ProgramArguments</key>
 	<key>ProgramArguments</key>

+ 4 - 6
dmx/rumble.pl

@@ -16,7 +16,7 @@ my $STEPS   = 8;
 my $EXP     = 2.375;
 my $EXP     = 2.375;
 my %DIM     = (
 my %DIM     = (
 	'OFF'    => [ { 'channel' => 64, 'value' => 0,   'time' => 0 } ],
 	'OFF'    => [ { 'channel' => 64, 'value' => 0,   'time' => 0 } ],
-	'FULL'   => [ { 'channel' => 64, 'value' => 255, 'time' => 0 } ],
+	'ON'     => [ { 'channel' => 64, 'value' => 255, 'time' => 0 } ],
 	'RAW'    => [ { 'channel' => 64, 'value' => 0,   'time' => 0 } ],
 	'RAW'    => [ { 'channel' => 64, 'value' => 0,   'time' => 0 } ],
 	'RANDOM' => [ { 'channel' => 64, 'value' => 0,   'time' => 100 } ],
 	'RANDOM' => [ { 'channel' => 64, 'value' => 0,   'time' => 100 } ],
 );
 );
@@ -47,8 +47,8 @@ $state = 'OFF';
 DMX::applyDataset($DIM{$state}, $state, $OUTPUT_FILE);
 DMX::applyDataset($DIM{$state}, $state, $OUTPUT_FILE);
 
 
 # Sockets
 # Sockets
+# We don't actually subscribe for state, but the framework is handy
 DMX::stateSocket($STATE_SOCK);
 DMX::stateSocket($STATE_SOCK);
-DMX::stateSubscribe($STATE_SOCK);
 
 
 # Loop forever
 # Loop forever
 while (1) {
 while (1) {
@@ -71,10 +71,8 @@ while (1) {
 	# Calculate the new state
 	# Calculate the new state
 	my $newValue = undef();
 	my $newValue = undef();
 	$stateLast = $state;
 	$stateLast = $state;
-	if ($newState eq 'STOP') {
-		$state = 'OFF';
-	} elsif ($newState eq 'FULL') {
-		$state = 'FULL';
+	if ($newState eq 'OFF' || $newState eq 'ON') {
+		$state = $newState;
 	} elsif ($newState eq 'RANDOM' || $newState eq 'RANDOM_FULL') {
 	} elsif ($newState eq 'RANDOM' || $newState eq 'RANDOM_FULL') {
 		$state    = 'RANDOM';
 		$state    = 'RANDOM';
 		$newValue = int(rand($STEPS) + 1);
 		$newValue = int(rand($STEPS) + 1);