aca-device-modules 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff402a8981cd00ad194800fedd2d640c8d523fc4
-  data.tar.gz: 4ea818c14ca5d2fa95ae79e1bb64a8267d70076c
+  metadata.gz: cf585e02ffea0aa04a948f0ab7b1c28fc4f1da1d
+  data.tar.gz: e6814389e38268242ff011cc80134e0fc65968e8
 SHA512:
-  metadata.gz: 187d638e7b2d043344da2004d0484d8ef7df8dff6747b67ebc3e90ad708d9b464254304c1e624eb3bffcb949f6b32d51036eb07b98695bca2153f10ff2a85acf
-  data.tar.gz: 583975c1ae6bf240d3f63fc88320b74c4abf18f1be8d26fe2c4eb69fdf48fb8bb3608c37914dbf36e363856e32409deb2cd03ce52dbbd0b48b6d461d3b7bc1f8
+  metadata.gz: f526e473152508cba0fc38e77ef119c6ad1425ab2f4b4ce3d53cc13853b31f78a124e463268eee67d7e6ba083f3121a942d61c62f9decc9bfbfc67510f69a998
+  data.tar.gz: 6b72b57ee0e7dcbcde43e4c8cf69ae4397db4b8eddaff70edd244eb899315fd84adb61154f65486d17f3b0abc6f6e0ed3331422be8a0956bce38e80695617f80

data/lib/aca-device-modules/version.rb

@@ -1,3 +1,3 @@
 module AcaDeviceModules
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
 end

data/modules/biamp/nexia.rb

@@ -57,8 +57,9 @@ class Biamp::Nexia
 		do_send('SETD', self[:device_id], 'FDRLVL', fader_id, 1, level)
 	end
 	
-	def mute(fader_id)
-		do_send('SETD', self[:device_id], 'FDRMUTE', fader_id, 1, 1)
+	def mute(fader_id, val = true)
+		actual = val ? 1 : 0
+		do_send('SETD', self[:device_id], 'FDRMUTE', fader_id, 1, actual)
 	end
 	
 	def unmute(fader_id)

data/modules/global_cache/gc100.rb

@@ -16,7 +16,6 @@ class GlobalCache::Gc100
     end
     
     def on_update
-        self[:config_indexed] = false
     end
     
     #
@@ -24,10 +23,9 @@ class GlobalCache::Gc100
     #  config => {:relay => {0 => '2:1',1 => '2:2',2 => '2:3',3 => '3:1'}} etc
     #
     def connected
-        unless self[:config_indexed]
-            self[:config] = {}
-            do_send('getdevices', :max_waits => 100)
-        end
+        @config = nil
+        self[:config_indexed] = false
+        do_send('getdevices', :max_waits => 100)
         
         @polling_timer = schedule.every('60s') do
             logger.debug "-- Polling GC100"
@@ -96,28 +94,27 @@ class GlobalCache::Gc100
             
             type = type.downcase.to_sym
             
-            update_status(:config) do |value|
-                value ||= {}
-                value[type] ||= {}
-                current = value[type].length
-                
-                dev_index = 1                
-                (current..(current + number.to_i - 1)).each do |index|
-                    port = "#{address}:#{dev_index}"
-                    value[type][index] = port
-                    value[port] = [type, index]
-                    dev_index += 1
-                end
-                
-                value
+            value = @config || {}
+            value[type] ||= {}
+            current = value[type].length
+            
+            dev_index = 1                
+            (current..(current + number.to_i - 1)).each do |index|
+                port = "#{address}:#{dev_index}"
+                value[type][index] = port
+                value[port] = [type, index]
+                dev_index += 1
             end
+            @config = value
+
             return :ignore
             
         when :endlistdevices
+            self[:num_relays] = @config[:relay].length unless @config[:relay].nil?
+            self[:num_ir] = @config[:ir].length unless @config[:ir].nil?
+            self[:config] = @config
+            @config = nil
             self[:config_indexed] = true
-            config = self[:config]
-            self[:num_relays] = config[:relay].length unless config[:relay].nil?
-            self[:num_ir] = config[:ir].length unless config[:ir].nil?
             
             return :success
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aca-device-modules
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails