aca-device-modules 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a3208fa3bfe5c4883031c977b64704307dc5471
-  data.tar.gz: 2293041e12e1d83d311703f228669c9956fb904a
+  metadata.gz: ff402a8981cd00ad194800fedd2d640c8d523fc4
+  data.tar.gz: 4ea818c14ca5d2fa95ae79e1bb64a8267d70076c
 SHA512:
-  metadata.gz: 64721a3b8ffd32b26b84b6b5ced65cb9bc803587e9c4a6ad2620414cc0f4c45dec1a2f38537f06686fac618e8760fb93c73c3d0105cc69d9913512685d817f3c
-  data.tar.gz: 5ac2fb618e3ad1451c38aa18ad53265128d89eab9be0057dc45a1baeb6554ed0f928b2132360c54a3e3a2da5822b68c3f0ef12d21eaab2603359c82cdcc82bfa
+  metadata.gz: 187d638e7b2d043344da2004d0484d8ef7df8dff6747b67ebc3e90ad708d9b464254304c1e624eb3bffcb949f6b32d51036eb07b98695bca2153f10ff2a85acf
+  data.tar.gz: 583975c1ae6bf240d3f63fc88320b74c4abf18f1be8d26fe2c4eb69fdf48fb8bb3608c37914dbf36e363856e32409deb2cd03ce52dbbd0b48b6d461d3b7bc1f8

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

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

data/modules/sony/display/gdx_and_fwd.rb

@@ -0,0 +1,295 @@
+module Sony; end
+module Sony::Display; end
+
+
+#
+# Port: 53484
+#
+class Sony::Display::GdxAndFwd
+	include ::Orchestrator::Constants
+    include ::Orchestrator::Transcoder
+
+	def on_load
+		self[:brightness_min] = 0x00
+        self[:brightness_max] = 0x64
+        self[:contrast_min] = 0x00
+        self[:contrast_max] = 0x64
+        self[:volume_min] = 0x00
+        self[:volume_max] = 0x64
+        self[:power] = false
+        self[:type] = :lcd
+
+		on_update
+	end
+
+	def on_update
+		# Default community value is SONY - can be changed in displays settings
+		@community = str_to_array(setting(:community) || 'SONY')
+	end
+	
+
+	def connected
+		@polling_timer = schedule.every('60s', method(:do_poll))
+	end
+
+	def disconnected
+		@polling_timer.cancel unless @polling_timer.nil?
+        @polling_timer = nil
+	end
+	
+	
+	
+	#
+	# Power commands
+	#
+	def power(state, opt = nil)
+		if is_affirmative?(state)
+			do_send(:power, 1)
+			logger.debug "-- sony display requested to power on"
+		else
+			do_send(:power, 0)
+			logger.debug "-- sony display requested to power off"
+		end
+
+		# Request status update
+		power?
+	end
+
+	def power?(options = {}, &block)
+		options[:emit] = block if block_given?
+		options[:priority] = 0
+		do_send(:power, options)
+	end
+	
+	
+	
+	#
+	# Input selection
+	#
+	INPUTS = {
+		:vga => 0x08,
+		:dvi => 0x20,
+		:hdmi => 0x44,
+		:hdmi2 => 0x84,
+		:hdmi3 => 0x85
+	}
+	INPUTS.merge!(INPUTS.invert)
+	
+	
+	def switch_to(input)
+		input = input.to_sym
+		return unless INPUTS.has_key? input
+		
+		do_send(:input, INPUTS[input])
+		logger.debug "-- sony display, requested to switch to: #{input}"
+		
+		input?
+	end
+
+	def input?
+		do_send(:input, {:priority => 0})
+	end
+	
+	
+	#
+	# Mute Audio and Video
+	#
+	def mute
+		logger.debug "-- sony display, requested to mute"
+		do_send(:mute, 1)
+		mute?
+	end
+
+	def unmute
+		logger.debug "-- sony display, requested to unmute"
+		do_send(:mute, 0)
+		mute?
+	end
+
+	def mute?
+		do_send(:mute, {:priority => 0})
+	end
+
+	def audio_mute
+		logger.debug "-- sony display, requested to mute"
+		do_send(:audio_mute, 1)
+		audio_mute?
+	end
+
+	def audio_unmute
+		logger.debug "-- sony display, requested to unmute"
+		do_send(:audio_mute, 0)
+		audio_mute?
+	end
+
+	def audio_mute?
+		do_send(:audio_mute, {:priority => 0})
+	end
+
+
+	#
+	# Automatically creates a callable function for each command
+	#	http://blog.jayfields.com/2007/10/ruby-defining-class-methods.html
+	#	http://blog.jayfields.com/2008/02/ruby-dynamically-define-method.html
+	#
+	[:contrast, :brightness, :volume].each do |command|
+		# Query command
+		define_method :"#{command}?" do
+			do_send(command, {:priority => 0})
+		end
+
+		# Set value command
+		define_method command do |level|
+			do_send(command, level)
+			__send__(:"#{command}?")
+		end
+	end
+
+	
+	
+	ERRORS = {
+		:ERR1 => '1: Undefined control command'.freeze,
+		:ERR2 => '2: Out of parameter range'.freeze,
+		:ERR3 => '3: Busy state or no-acceptable period'.freeze,
+		:ERR4 => '4: Timeout or no-acceptable period'.freeze,
+		:ERR5 => '5: Wrong data length'.freeze,
+		:ERRA => 'A: Password mismatch'.freeze
+	}
+
+	RESP = {
+		0x00 => :success,
+		0x01 => :limit_over,
+		0x02 => :limit_under,
+		0x03 => :cancelled
+	}
+	
+
+	def received(data, resolve, command)		# Data is default received as a string
+		logger.debug "sony display sent: 0x#{byte_to_hex(data)}"
+
+		idt_header = data[0..1]
+		idt_community = data[2..5]
+		idt_command = str_to_array(data[6..9])
+		resp = str_to_array(data[10..-1])
+
+		if idt_command[0] == 0x01
+			# resp is now equal to the unit control codes
+
+			type = RESP[resp[1]]
+
+			case type
+			when :success
+				if resp.length > 3 && command
+					# This is a request response
+					cmd = command[:name]
+
+					case cmd
+					when :power, :audio_mute, :mute
+						self[cmd] = resp[3] == 0x01
+					when :input
+						self[cmd] = INPUTS[resp[3]]
+					when :signal_status
+						self[cmd] = resp[3] != 0x01
+					when :contrast, :brightness, :volume
+						self[cmd] = resp[3]
+					end
+				end
+				return :success
+			when :limit_over, :limit_under
+				warning = "sony display sent a value that was #{type}"
+				warning += " for command #{command[:name]}" if command
+
+				logger.warn warning 
+
+				return :abort
+			when :cancelled
+				# Attempt the request again
+				return :retry
+			end
+
+		else
+			# Command failed.. value == error code
+			return :abort
+		end
+	end
+
+	
+	
+	protected
+	
+	
+	def do_poll(*args)
+		power?({:priority => 0}) do
+			if self[:power]
+				input?
+				mute?
+				audio_mute?
+				volume?
+				do_send(:signal_status, {:priority => 0})
+			end
+		end
+	end
+
+	# Constants as per manual page 18
+	# version, category
+	IdTalk_Header = [0x02, 0x10]
+
+	# Unit protocol as per manual page 21
+	# Dedicated unit protocol
+	IdTalk_Type = [0xF1, 0x00]
+
+
+			# category, command
+	COMMANDS = {
+		power: [0x00, 0x00],
+		input: [0x00, 0x01],
+		audio_mute: [0x00, 0x03],
+		signal_status: [0x00, 0x75],
+		mute: [0x00, 0x8D],
+
+		contrast: [0x10, 0x00],
+		brightness: [0x10, 0x01],
+		volume: [0x10, 0x30]
+	}
+	COMMANDS.merge!(COMMANDS.invert)
+
+
+	def build_checksum(command)
+		check = 0
+        command.each do |byte|
+            check = (check + byte) & 0xFF
+        end
+        [check]
+	end
+
+
+	def do_send(command, param = nil, options = {})
+		# Check for missing params
+		if param.is_a? Hash
+			options = param
+			param = nil
+		end
+
+		# Control + Mode
+		if param.nil?
+			options[:name] = command
+			cmd = [0x83] + COMMANDS[command] + [0xFF, 0xFF]
+		else
+			options[:name] = :"#{command}_cmd"
+			type = [0x8C] + COMMANDS[command]
+			if !param.is_a?(Array)
+				param = [param]
+			end
+			data = [param.length + 1] + param
+			cmd = type + data
+		end
+
+		cmd = cmd + build_checksum(cmd)
+
+		# Build the IDTalk header         # set request every time?
+		idt_cmd = IdTalk_Header + @community + [0x00] + IdTalk_Type + [cmd.length] + cmd
+
+		send(idt_cmd, options)
+	end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aca-device-modules
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -65,6 +65,7 @@ files:
 - modules/panasonic/camera/he50.rb
 - modules/panasonic/projector/pj_link.rb
 - modules/samsung/displays/md_series.rb
+- modules/sony/display/gdx_and_fwd.rb
 - modules/vaddio/camera/clear_view_ptz_telnet.rb
 homepage: http://cotag.me/
 licenses: