aca-device-modules 1.0.4 → 1.0.5

data/modules/extron/switcher/dxp.rb

@@ -32,218 +32,218 @@ module Extron::Switcher; end
 
 
 class Extron::Switcher::Dxp
-	include ::Orchestrator::Constants
+    include ::Orchestrator::Constants
     include ::Orchestrator::Transcoder
 
 
-	def on_load
-		#
-		# Setup constants
-		#
-		defaults({
-			:wait => false
-		})
-		config({
-			:clear_queue_on_disconnect => true	# Clear the queue as we may need to send login
-		})
-	end
-
-	def connected
-		@polling_timer = schedule.every('2m') do
-			logger.debug "-- Extron Maintaining Connection"
-			send('Q', :priority => 0)	# Low priority poll to maintain connection
-		end
-	end
-
-	def disconnected
-		#
-		# Disconnected may be called without calling connected
-		#	Hence the check if timer is nil here
-		#
-		@polling_timer.cancel unless @polling_timer.nil?
-		@polling_timer = nil
-	end
-
-
-	def direct(string)
-		send(string, :wait => false)
-	end
-
-
-	#
-	# No need to wait as commands can be chained
-	#
-	def switch(map)
-		map.each do |input, outputs|
-			input = input.to_s if input.is_a?(Symbol)
-			input = input.to_i if input.is_a?(String)
-
-			outputs = [outputs] unless outputs.is_a?(Array)
-			command = ''
-			outputs.each do |output|
-				command += "#{input}*#{output}!"
-			end
-			send(command)
-		end
-	end
-
-	def switch_video(map)
-		map.each do |input, outputs|
-			input = input.to_s if input.is_a?(Symbol)
-			input = input.to_i if input.is_a?(String)
-			
-			
-			outputs = [outputs] unless outputs.is_a?(Array)
-			command = ''
-			outputs.each do |output|
-				command += "#{input}*#{output}%"
-			end
-			send(command)
-		end
-	end
-
-	def switch_audio(map)
-		map.each do |input, outputs|
-			input = input.to_s if input.is_a?(Symbol)
-			input = input.to_i if input.is_a?(String)
-			
-			outputs = [outputs] unless outputs.is_a?(Array)
-			command = ''
-			outputs.each do |output|
-				command += "#{input}*#{output}$"
-			end
-			send(command)
-		end
-	end
-
-	def mute_video(outputs)
-		outputs = [outputs] unless outputs.is_a?(Array)
-		command = ''
-		outputs.each do |output|
-			command += "#{output}*1B"
-		end
-		send(command)
-	end
-
-	def unmute_video(outputs)
-		outputs = [outputs] unless outputs.is_a?(Array)
-		command = ''
-		outputs.each do |output|
-			command += "#{output}*0B"
-		end
-		send(command)
-	end
-
-	def mute_audio(outputs)
-		outputs = [outputs] unless outputs.is_a?(Array)
-		command = ''
-		outputs.each do |output|
-			command += "#{output}*1Z"
-		end
-		send(command)
-	end
-
-	def unmute_audio(outputs)
-		outputs = [outputs] unless outputs.is_a?(Array)
-		command = ''
-		outputs.each do |output|
-			command += "#{output}*0Z"
-		end
-		send(command)
-	end
-
-	def set_preset(number)
-		send("#{number},")
-	end
-
-	def recall_preset(number)
-		send("#{number}.")
-	end
-
-
-	#def response_delimiter
-	#	[0x0D, 0x0A]	# Used to interpret the end of a message
-	#end
-
-
-	#
-	# Sends copyright information
-	# Then sends password prompt
-	#
-	def received(data, resolve, command)
-		logger.debug "Extron Matrix sent #{data}"
-
-		if command.nil? && data =~ /Copyright/i
-			pass = setting(:password)
-			if pass.nil?
-				device_ready
-			else
-				do_send(pass)		# Password set
-			end
-		elsif data =~ /Login/i
-			device_ready
-		elsif command.present? && command[:command] == :information
-			data = data.split(' ')
-			video = data[0][1..-1].split('X')
-			self[:video_inputs] = video[0].to_i
-			self[:video_outputs] = video[1].to_i
-
-			audio = data[1][1..-1].split('X')
-			self[:audio_inputs] = audio[0].to_i
-			self[:audio_outputs] = audio[1].to_i
-		else
-			case data[0..1].to_sym
-			when :Am	# Audio mute
-				data = data[3..-1].split('*')
-				self["audio#{data[0].to_i}_muted"] = data[1] == '1'
-			when :Vm	# Video mute
-				data = data[3..-1].split('*')
-				self["video#{data[0].to_i}_muted"] = data[1] == '1'
-			when :In	# Input to all outputs
-				data = data[2..-1].split(' ')
-				input = data[0].to_i
-				if data[1] =~ /(All|RGB|Vid)/
-					for i in 1..self[:video_outputs]
-						self["video#{i}"] = input
-					end
-				end
-				if data[1] =~ /(All|Aud)/
-					for i in 1..self[:audio_outputs]
-						self["audio#{i}"] = input
-					end
-				end
-			when :Ou	# Output x to input y
-				data = data[3..-1].split(' ')
-				output = data[0].to_i
-				input = data[1][2..-1].to_i
-				if data[2] =~ /(All|RGB|Vid)/
-					self["video#{output}"] = input
-				end
-				if data[2] =~ /(All|Aud)/
-					self["audio#{output}"] = input
-				end
-			else
-				if data == 'E22'	# Busy! We should retry this one
-					command[:delay_on_receive] = 1 unless command.nil?
-					return :failed
-				end
-			end
-		end
-
-		return :success
-	end
-
-
-	private
-
-
-	def device_ready
-		send("I", :wait => true, :command => :information)
-		do_send("\e3CV", :wait => true)	# Verbose mode and tagged responses
-	end
-
-	def do_send(data, options = {})
-		send(data << 0x0D, options)
-	end
+    def on_load
+        #
+        # Setup constants
+        #
+        defaults({
+            :wait => false
+        })
+        config({
+            :clear_queue_on_disconnect => true    # Clear the queue as we may need to send login
+        })
+    end
+
+    def connected
+        @polling_timer = schedule.every('2m') do
+            logger.debug "-- Extron Maintaining Connection"
+            send('Q', :priority => 0)    # Low priority poll to maintain connection
+        end
+    end
+
+    def disconnected
+        #
+        # Disconnected may be called without calling connected
+        #    Hence the check if timer is nil here
+        #
+        @polling_timer.cancel unless @polling_timer.nil?
+        @polling_timer = nil
+    end
+
+
+    def direct(string)
+        send(string, :wait => false)
+    end
+
+
+    #
+    # No need to wait as commands can be chained
+    #
+    def switch(map)
+        map.each do |input, outputs|
+            input = input.to_s if input.is_a?(Symbol)
+            input = input.to_i if input.is_a?(String)
+
+            outputs = [outputs] unless outputs.is_a?(Array)
+            command = ''
+            outputs.each do |output|
+                command += "#{input}*#{output}!"
+            end
+            send(command)
+        end
+    end
+
+    def switch_video(map)
+        map.each do |input, outputs|
+            input = input.to_s if input.is_a?(Symbol)
+            input = input.to_i if input.is_a?(String)
+            
+            
+            outputs = [outputs] unless outputs.is_a?(Array)
+            command = ''
+            outputs.each do |output|
+                command += "#{input}*#{output}%"
+            end
+            send(command)
+        end
+    end
+
+    def switch_audio(map)
+        map.each do |input, outputs|
+            input = input.to_s if input.is_a?(Symbol)
+            input = input.to_i if input.is_a?(String)
+            
+            outputs = [outputs] unless outputs.is_a?(Array)
+            command = ''
+            outputs.each do |output|
+                command += "#{input}*#{output}$"
+            end
+            send(command)
+        end
+    end
+
+    def mute_video(outputs)
+        outputs = [outputs] unless outputs.is_a?(Array)
+        command = ''
+        outputs.each do |output|
+            command += "#{output}*1B"
+        end
+        send(command)
+    end
+
+    def unmute_video(outputs)
+        outputs = [outputs] unless outputs.is_a?(Array)
+        command = ''
+        outputs.each do |output|
+            command += "#{output}*0B"
+        end
+        send(command)
+    end
+
+    def mute_audio(outputs)
+        outputs = [outputs] unless outputs.is_a?(Array)
+        command = ''
+        outputs.each do |output|
+            command += "#{output}*1Z"
+        end
+        send(command)
+    end
+
+    def unmute_audio(outputs)
+        outputs = [outputs] unless outputs.is_a?(Array)
+        command = ''
+        outputs.each do |output|
+            command += "#{output}*0Z"
+        end
+        send(command)
+    end
+
+    def set_preset(number)
+        send("#{number},")
+    end
+
+    def recall_preset(number)
+        send("#{number}.")
+    end
+
+
+    #def response_delimiter
+    #    [0x0D, 0x0A]    # Used to interpret the end of a message
+    #end
+
+
+    #
+    # Sends copyright information
+    # Then sends password prompt
+    #
+    def received(data, resolve, command)
+        logger.debug "Extron Matrix sent #{data}"
+
+        if command.nil? && data =~ /Copyright/i
+            pass = setting(:password)
+            if pass.nil?
+                device_ready
+            else
+                do_send(pass)        # Password set
+            end
+        elsif data =~ /Login/i
+            device_ready
+        elsif command.present? && command[:command] == :information
+            data = data.split(' ')
+            video = data[0][1..-1].split('X')
+            self[:video_inputs] = video[0].to_i
+            self[:video_outputs] = video[1].to_i
+
+            audio = data[1][1..-1].split('X')
+            self[:audio_inputs] = audio[0].to_i
+            self[:audio_outputs] = audio[1].to_i
+        else
+            case data[0..1].to_sym
+            when :Am    # Audio mute
+                data = data[3..-1].split('*')
+                self["audio#{data[0].to_i}_muted"] = data[1] == '1'
+            when :Vm    # Video mute
+                data = data[3..-1].split('*')
+                self["video#{data[0].to_i}_muted"] = data[1] == '1'
+            when :In    # Input to all outputs
+                data = data[2..-1].split(' ')
+                input = data[0].to_i
+                if data[1] =~ /(All|RGB|Vid)/
+                    for i in 1..self[:video_outputs]
+                        self["video#{i}"] = input
+                    end
+                end
+                if data[1] =~ /(All|Aud)/
+                    for i in 1..self[:audio_outputs]
+                        self["audio#{i}"] = input
+                    end
+                end
+            when :Ou    # Output x to input y
+                data = data[3..-1].split(' ')
+                output = data[0].to_i
+                input = data[1][2..-1].to_i
+                if data[2] =~ /(All|RGB|Vid)/
+                    self["video#{output}"] = input
+                end
+                if data[2] =~ /(All|Aud)/
+                    self["audio#{output}"] = input
+                end
+            else
+                if data == 'E22'    # Busy! We should retry this one
+                    command[:delay_on_receive] = 1 unless command.nil?
+                    return :failed
+                end
+            end
+        end
+
+        return :success
+    end
+
+
+    private
+
+
+    def device_ready
+        send("I", :wait => true, :command => :information)
+        do_send("\e3CV", :wait => true)    # Verbose mode and tagged responses
+    end
+
+    def do_send(data, options = {})
+        send(data << 0x0D, options)
+    end
 end
 

data/modules/global_cache/gc100.rb

@@ -63,7 +63,9 @@ class GlobalCache::Gc100
     def relay_status?(index, &block)
         if index < self[:num_relays]
             connector = self[:config][:relay][index]
-            do_send("getstate,#{connector}", {:emit => {"relay#{index}".to_sym => block}})
+            options = {}
+            options[:emit] = block if block_given?
+            do_send("getstate,#{connector}", options)
         else
             logger.warn "Attempted to check IO on GlobalCache that does not exist: #{index}"
         end
@@ -72,7 +74,9 @@ class GlobalCache::Gc100
     def io_status?(index, &block)
         if index < self[:num_ir]
             connector = self[:config][:ir][index]
-            do_send("getstate,#{connector}", {:emit => {"ir#{index}".to_sym => block}})
+            options = {}
+            options[:emit] = block if block_given?
+            do_send("getstate,#{connector}", options)
         else
             logger.warn "Attempted to check IO on GlobalCache that does not exist: #{index}"
         end

data/modules/kramer/switcher/protocol3000.rb

@@ -24,220 +24,220 @@ module Kramer::Switcher; end
 #
 
 class Kramer::Switcher::Protocol3000
-	include ::Orchestrator::Constants
+    include ::Orchestrator::Constants
     include ::Orchestrator::Transcoder
-	
-	def on_load
-		config({
+    
+    def on_load
+        config({
             tokenize: true,
             delimiter: "\x0D\x0A",
             encoding: "ASCII-8BIT"
         })
 
         on_update
-	end
-
-	def on_update
-		@device_id = setting(:kramer_id)
-		@destination = "#{@device_id}@" if @device_id
-
-		@login_level = setting(:kramer_login)
-		@password = setting(:kramer_password) if @login_level
-    end
-	
-	def connected
-		#
-		# Get current state of the switcher
-		#
-		protocol_handshake
-		login
-		get_machine_info
-
-		@polling_timer = schedule.every('2m') do
-			logger.debug "-- Kramer Maintaining Connection"
-			do_send('MODEL?', {:priority => 0})	# Low priority poll to maintain connection
-		end
-	end
-
-	def disconnected
-		@polling_timer.cancel unless @polling_timer.nil?
-		@polling_timer = nil
-	end
-	
-	
-	#
-	# Starting at input 1, input 0 == disconnect
-	#
-	def switch(map, out = nil)
-		map = {map => out} if out
-		do_send(CMDS[:switch], build_switch_data(map))
-	end
-
-
-	def switch_video(map, out = nil)
-		map = {map => out} if out
-		do_send(CMDS[:switch_video], build_switch_data(map))
-	end
-
-
-	def switch_audio(map, out = nil)
-		map = {map => out} if out
-		do_send(CMDS[:switch_audio], build_switch_data(map))
-	end
-
-
-	def mute_video(out, state = true)
-		data = is_affirmative?(state) ? 1 : 0
-		do_send(CMDS[:video_mute], out, data)
-	end
-
-	def mute_audio(out, state = true)
-		data = is_affirmative?(state) ? 1 : 0
-		do_send(CMDS[:audio_mute], out, data)
-	end
-
-	def unmute_video(out)
-		mute_video out, false
-	end
-
-	def unmute_audio(out)
-		mute_audio out, false
-	end
-	
-
-	def received(data, resolve, command)
-		logger.debug "Kramer sent #{data}"
-		
-		# Extract and check the machine number if we've defined it
-		components = data.split('@')
-		if components.length > 1
-			machine = components[0]
-			if @device_id && machine != @device_id
-				return :ignore
-			end
-		end
-
-		data = components[-1].strip
-		components = data.split(/\s+|,/)
-
-		cmd = components[0]
-		args = components[1..-1]
-
-		if cmd == 'OK'
-			return :success
-		elsif cmd[0..2] == 'ERR' || args[0][0..2] == 'ERR'
-			if cmd[0..2] == 'ERR'
-				error = cmd[3..-1]
-				errfor = nil
-			else
-				error = args[0][3..-1]
-				errfor = " on #{cmd}"
-			end
-			logger.error "Kramer command error #{error}#{errfor}"
-			self[:last_error] = error
-			return :abort
-		end
-
-		case CMDS[cmd.to_sym]
-		when :info
-			self[:video_inputs] = args[1].to_i
-			self[:video_outputs] = args[3].to_i
-		when :route
-			inout = args[0].split(',')
-			layer = inout[0].to_i
-			dest = inout[1].to_i
-			src = inout[2].to_i
-			self[:"#{LAYERS[layer]}#{dest}"] = src
-		when :switch, :switch_audio, :switch_video
-			# return string like "in>out,in>out,in>out"
-
-			type = :av
-			type = :audio if CMDS[cmd] == :switch_audio
-			type = :video if CMDS[cmd] == :switch_video
-
-			mappings = args[0].split(',')
-			mappings.each do |map|
-				inout = map.split('>')
-				self[:"#{type}#{inout[1]}"] = inout[0].to_i
-			end
-		when :audio_mute
-			output, mute = args[0].split(',')
-			self[:"audio#{output}_muted"] = mute == '1'
-		when :video_mute
-			output, mute = args[0].split(',')
-			self[:"video#{output}_muted"] = mute == '1'
-		end
-		
-		return :success
-	end
-
-
-	CMDS = {
-		info: :"INFO-IO?",
-		login: :"LOGIN",
-		route: :"ROUTE",
-		switch: :"AV",
-		switch_audio: :"AUD",
-		switch_video: :"VID",
-		audio_mute: :"MUTE",
-		video_mute: :"VMUTE"
-	}
-	CMDS.merge!(CMDS.invert)
-
-	LAYERS = {
-		1 => :video,
-		2 => :audio,
-		2 => :data
-	}
-	
-	
-	private
-
-
-	def build_switch_data(map)
-		data = ''
-
-		map.each do |input, outputs|
-			outputs = [outputs] unless outputs.class == Array
-			input = input.to_s if input.class == Symbol
-			input = input.to_i if input.class == String
-			outputs.each do |output|
-				data << "#{input}>#{output},"
-			end
-		end
-
-		data.chop
-	end
-
-
-	def protocol_handshake
-		do_send('', {priority: 99})
-	end
-
-	def login
-		if @login_level
-			do_send(CMDS[:login], @password, {priority: 99})
-		end
-	end
-
-	def get_machine_info
-		do_send(CMDS[:info], {priority: 99})
-	end
-
-
-	def do_send(command, *args)
-		options = {}
-		if args[-1].is_a? Hash
-			options = args.pop
-		end
-
-		cmd = "##{@destination}#{command}"
-
-		if args.length > 0
-			cmd << " #{args.join(',')}"
-		end
-		cmd << "\r"
-
-		send(cmd, options)
-	end
+    end
+
+    def on_update
+        @device_id = setting(:kramer_id)
+        @destination = "#{@device_id}@" if @device_id
+
+        @login_level = setting(:kramer_login)
+        @password = setting(:kramer_password) if @login_level
+    end
+    
+    def connected
+        #
+        # Get current state of the switcher
+        #
+        protocol_handshake
+        login
+        get_machine_info
+
+        @polling_timer = schedule.every('2m') do
+            logger.debug "-- Kramer Maintaining Connection"
+            do_send('MODEL?', {:priority => 0})    # Low priority poll to maintain connection
+        end
+    end
+
+    def disconnected
+        @polling_timer.cancel unless @polling_timer.nil?
+        @polling_timer = nil
+    end
+    
+    
+    #
+    # Starting at input 1, input 0 == disconnect
+    #
+    def switch(map, out = nil)
+        map = {map => out} if out
+        do_send(CMDS[:switch], build_switch_data(map))
+    end
+
+
+    def switch_video(map, out = nil)
+        map = {map => out} if out
+        do_send(CMDS[:switch_video], build_switch_data(map))
+    end
+
+
+    def switch_audio(map, out = nil)
+        map = {map => out} if out
+        do_send(CMDS[:switch_audio], build_switch_data(map))
+    end
+
+
+    def mute_video(out, state = true)
+        data = is_affirmative?(state) ? 1 : 0
+        do_send(CMDS[:video_mute], out, data)
+    end
+
+    def mute_audio(out, state = true)
+        data = is_affirmative?(state) ? 1 : 0
+        do_send(CMDS[:audio_mute], out, data)
+    end
+
+    def unmute_video(out)
+        mute_video out, false
+    end
+
+    def unmute_audio(out)
+        mute_audio out, false
+    end
+    
+
+    def received(data, resolve, command)
+        logger.debug "Kramer sent #{data}"
+        
+        # Extract and check the machine number if we've defined it
+        components = data.split('@')
+        if components.length > 1
+            machine = components[0]
+            if @device_id && machine != @device_id
+                return :ignore
+            end
+        end
+
+        data = components[-1].strip
+        components = data.split(/\s+|,/)
+
+        cmd = components[0]
+        args = components[1..-1]
+
+        if cmd == 'OK'
+            return :success
+        elsif cmd[0..2] == 'ERR' || args[0][0..2] == 'ERR'
+            if cmd[0..2] == 'ERR'
+                error = cmd[3..-1]
+                errfor = nil
+            else
+                error = args[0][3..-1]
+                errfor = " on #{cmd}"
+            end
+            logger.error "Kramer command error #{error}#{errfor}"
+            self[:last_error] = error
+            return :abort
+        end
+
+        case CMDS[cmd.to_sym]
+        when :info
+            self[:video_inputs] = args[1].to_i
+            self[:video_outputs] = args[3].to_i
+        when :route
+            inout = args[0].split(',')
+            layer = inout[0].to_i
+            dest = inout[1].to_i
+            src = inout[2].to_i
+            self[:"#{LAYERS[layer]}#{dest}"] = src
+        when :switch, :switch_audio, :switch_video
+            # return string like "in>out,in>out,in>out"
+
+            type = :av
+            type = :audio if CMDS[cmd] == :switch_audio
+            type = :video if CMDS[cmd] == :switch_video
+
+            mappings = args[0].split(',')
+            mappings.each do |map|
+                inout = map.split('>')
+                self[:"#{type}#{inout[1]}"] = inout[0].to_i
+            end
+        when :audio_mute
+            output, mute = args[0].split(',')
+            self[:"audio#{output}_muted"] = mute == '1'
+        when :video_mute
+            output, mute = args[0].split(',')
+            self[:"video#{output}_muted"] = mute == '1'
+        end
+        
+        return :success
+    end
+
+
+    CMDS = {
+        info: :"INFO-IO?",
+        login: :"LOGIN",
+        route: :"ROUTE",
+        switch: :"AV",
+        switch_audio: :"AUD",
+        switch_video: :"VID",
+        audio_mute: :"MUTE",
+        video_mute: :"VMUTE"
+    }
+    CMDS.merge!(CMDS.invert)
+
+    LAYERS = {
+        1 => :video,
+        2 => :audio,
+        2 => :data
+    }
+    
+    
+    private
+
+
+    def build_switch_data(map)
+        data = ''
+
+        map.each do |input, outputs|
+            outputs = [outputs] unless outputs.class == Array
+            input = input.to_s if input.class == Symbol
+            input = input.to_i if input.class == String
+            outputs.each do |output|
+                data << "#{input}>#{output},"
+            end
+        end
+
+        data.chop
+    end
+
+
+    def protocol_handshake
+        do_send('', {priority: 99})
+    end
+
+    def login
+        if @login_level
+            do_send(CMDS[:login], @password, {priority: 99})
+        end
+    end
+
+    def get_machine_info
+        do_send(CMDS[:info], {priority: 99})
+    end
+
+
+    def do_send(command, *args)
+        options = {}
+        if args[-1].is_a? Hash
+            options = args.pop
+        end
+
+        cmd = "##{@destination}#{command}"
+
+        if args.length > 0
+            cmd << " #{args.join(',')}"
+        end
+        cmd << "\r"
+
+        send(cmd, options)
+    end
 end