aca-device-modules 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b69086f2a1f7cedc0f6ee28a9dba6f771233396
-  data.tar.gz: 6080121ffbf65e399205c885be16959f7b7603d7
+  metadata.gz: 42450f49d3ea6b361c2165a538da7fb1fcfaefe4
+  data.tar.gz: c329004ee38ae2d1c1307b0f6bf5756b903319cc
 SHA512:
-  metadata.gz: 38add061a9db39ec6ed34d2cfb9bba11c2d7c395f0498c1f74a2089c3a606cfafc4b0e4df7f9e62b460567dbb03108cc66507b4d573fcf8cbdd654c5b10d00ee
-  data.tar.gz: 7a5c4ecc2012e09c552bb0a48f6af767d33a1e61c47a7a850463653c4d972695e2de8ba2f7e7a6fde05d59a87d65d4094684e0a0f0b02c1ab335e841987e08a9
+  metadata.gz: 143e793dec4c59c3a2ef93abd089ea7cea306d334a0e5b1c9ba347f52e9810f3a6ac7edb69253a0d630046351e47ee3fce40c5d8f3c5171d8d776ee26d271b8f
+  data.tar.gz: 4dda6028de6a8d3104d59ee381a5a14f883d2b28e8ae5b500982c750d70c8233dae3f3adfc9b6b53c9c687f0c834c5cc34907fe8d135def7835b9c90000f68a1

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

@@ -1,3 +1,3 @@
 module AcaDeviceModules
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
 end

data/modules/aca/lifter_logic_auto.rb

@@ -0,0 +1,71 @@
+module Aca; end
+
+# Logic module
+# Abstracts screen or projector lift up and down control
+# Where the DigitalIO device supports plusing deals with the timers
+
+class Aca::LifterLogicAuto
+    include ::Orchestrator::Constants
+
+    def on_load
+        on_update
+    end
+
+    def on_update
+        @module = setting(:module) || :DigitalIO
+        @index = setting(:index) || 1
+
+        # {"up": [[index, state, time]]}
+        @up_config = setting(:up)
+        @down_config = setting(:down)
+
+        # {"rotate": [{"active": [index, state, time], "inactive": [index, state, time]}]}
+        @rotate_config = setting(:rotate)
+    end
+
+
+    def state(val, index = 1)
+        if is_affirmative?(val)
+            down(index)
+        else
+            up(index)
+        end
+    end
+
+    def up(index = 1)
+        pos = index - 1
+        mod = system.get(@module, @index)
+        cmd = @up_config[pos]
+
+        # Send twice as screen will stop if moving the first pulse
+        # Then the second pulse will cause it to change direction
+        mod.relay(*cmd)
+        mod.relay(*cmd) if cmd.length > 2
+
+        self[:"lifter#{index}"] = :up
+    end
+
+    def down(index = 1)
+        pos = index - 1
+        mod = system.get(@module, @index)
+        cmd = @down_config[pos]
+
+        mod.relay(*cmd)
+        mod.relay(*cmd) if cmd.length > 2
+
+        self[:"lifter#{index}"] = :down
+    end
+
+    def rotate(state, index = 1)
+        pos = index - 1
+        mod = system.get(@module, @index)
+
+        type = is_affirmative?(state) ? :active : :inactive
+        cmd = @rotate_config[pos][type]
+
+        mod.relay(*cmd)
+        mod.relay(*cmd) if cmd.length > 2
+
+        self[:"lifter#{index}_rotation"] = type
+    end
+end

data/modules/aca/lifter_logic_manual.rb

@@ -0,0 +1,105 @@
+module Aca; end
+
+# Logic module
+# Abstracts screen or projector lift up and down control
+# Where the DigitalIO does not have a pulse command and timers are required
+
+class Aca::LifterLogicManual
+    include ::Orchestrator::Constants
+
+    def on_load
+        @next = {}
+        @pulsing = {}
+
+        on_update
+    end
+
+    def on_update
+        @module = setting(:module) || :DigitalIO
+        @index = setting(:index) || 1
+
+        # {"up": [[index, state, time]]}
+        @up_config = setting(:up)
+        @down_config = setting(:down)
+
+        # {"rotate": [{"active": [index, state, time], "inactive": [index, state, time]}]}
+        @rotate_config = setting(:rotate)
+    end
+
+
+    def state(val, index = 1)
+        if is_affirmative?(val)
+            down(index)
+        else
+            up(index)
+        end
+    end
+
+    def up(index = 1)
+        pos = index - 1
+        mod = system.get(@module, @index)
+        cmd = @up_config[pos]
+
+        # Send twice as screen will stop if moving the first pulse
+        # Then the second pulse will cause it to change direction
+        pulse(mod, *cmd)
+        pulse(mod, *cmd) if cmd.length > 2
+
+        self[:"lifter#{index}"] = :up
+    end
+
+    def down(index = 1)
+        pos = index - 1
+        mod = system.get(@module, @index)
+        cmd = @down_config[pos]
+
+        pulse(mod, *cmd)
+        pulse(mod, *cmd) if cmd.length > 2
+
+        self[:"lifter#{index}"] = :down
+    end
+
+    def rotate(state, index = 1)
+        pos = index - 1
+        mod = system.get(@module, @index)
+
+        type = is_affirmative?(state) ? :active : :inactive
+        cmd = @rotate_config[pos][type]
+
+        pulse(mod, *cmd)
+        pulse(mod, *cmd) if cmd.length > 2
+
+        self[:"lifter#{index}_rotation"] = type
+    end
+
+
+    protected
+
+
+    def pulse(mod, relay, state, time = nil)
+
+        if time.nil?
+            # On == up and Off == down etc
+            mod.relay relay, state
+
+        elsif time && @pulsing[relay].nil?
+            # Pulse to move up / down
+            mod.relay relay, state
+
+            @pulsing[relay] = schedule.in("#{time}s") do
+                @pulsing.delete(relay)
+                mod.relay relay, !state
+
+                if @next[relay]
+                    args = @next[relay]
+                    @next.delete(relay)
+                    pulse *args
+                end
+            end
+        else
+
+            # A pulse is already in progress. Lets wait it out
+            @next[relay] = [mod, relay, state, time]
+        end
+    end
+end

data/modules/aca/pc_control.rb

@@ -2,141 +2,141 @@ module Aca; end
 
 #
 # Settings required:
-#	* domain (domain that we will be authenticating against)
-#	* username (username for authentication)
-#	* password (password for authentication)
+#    * domain (domain that we will be authenticating against)
+#    * username (username for authentication)
+#    * password (password for authentication)
 #
 # (built in)
 # connected
 #
 class Aca::PcControl
-	include ::Orchestrator::Constants
+    include ::Orchestrator::Constants
     include ::Orchestrator::Transcoder
 
-	#
-	# 	initialize will not have access to settings
-	#
-	def on_load
-		
-		#
-		# Setup constants
-		#
-		self[:authenticated] = 0
+    #
+    #     initialize will not have access to settings
+    #
+    def on_load
+        
+        #
+        # Setup constants
+        #
+        self[:authenticated] = 0
 
-		config({
-			tokenize: true,
-			delimiter: "\x03",
-			indicator: "\x02"
-		})
-	end
-	
-	def connected
-		@polling_timer = schedule.every('60s') do
+        config({
+            tokenize: true,
+            delimiter: "\x03",
+            indicator: "\x02"
+        })
+    end
+    
+    def connected
+        @polling_timer = schedule.every('60s') do
             logger.debug "-- Polling Computer"
             do_send({:control => "app", :command => 'do_nothing'}, {wait: false})
         end
-	end
-	
-	def disconnected
-		self[:authenticated] = 0
-		@polling_timer.cancel unless @polling_timer.nil?
+    end
+    
+    def disconnected
+        self[:authenticated] = 0
+        @polling_timer.cancel unless @polling_timer.nil?
         @polling_timer = nil
-	end
-	
-	def launch_application(app, *args)
-		do_send({:control => "app", :command => app, :args => args})
-	end
+    end
+    
+    def launch_application(app, *args)
+        do_send({:control => "app", :command => app, :args => args})
+    end
 
-	def wake(broadcast = nil)
-		mac = setting(:mac_address)
+    def wake(broadcast = nil)
+        mac = setting(:mac_address)
         if mac
             # config is the database model representing this device
             wake_device(mac, broadcast || '<broadcast>')
         end
         logger.debug "Waking computer #{mac} #{broadcast}"
         nil
-	end
+    end
 
-	def shutdown
-		launch_application 'shutdown.exe', '/s', '/t', '0'
-	end
+    def shutdown
+        launch_application 'shutdown.exe', '/s', '/t', '0'
+    end
 
-	def logoff
-		launch_application 'shutdown.exe', '/l', '/t', '0'
-	end
+    def logoff
+        launch_application 'shutdown.exe', '/l', '/t', '0'
+    end
 
-	def restart
-		launch_application 'shutdown.exe', '/r', '/t', '0'
-	end
-	
+    def restart
+        launch_application 'shutdown.exe', '/r', '/t', '0'
+    end
+    
 
 
-	#
-	# Camera controls
-	#
-	CAM_OPERATIONS = [:up, :down, :left, :right, :center, :zoomin, :zoomout]
-	
-	#
-	# 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
-	#
-	CAM_OPERATIONS.each do |command|
-		define_method command do |*args|
-			# Cam control is low priority in case a camera is not plugged in
-			do_send({:control => "cam", :command => command.to_s, :args => []}, {:priority => 0, :retries => 0})
-		end
-	end
-	
-	def zoom(val)
-		do_send({:control => "cam", :command => "zoom", :args => [val.to_s]})
-	end
-	
-	def received(data, resolve, command)
-		
-		#
-		# Convert the message into a native object
-		#
-		data = JSON.parse(data, {:symbolize_names => true})
-		
-		#
-		# Process the response
-		#
-		if data[:command] == "authenticate"
-			command = {:control => "auth", :command => setting(:domain), :args => [setting(:username), setting(:password)]}
-			if self[:authenticated] > 0
-				#
-				# Token retry (probably always fail - at least we can see in the logs)
-				#	We don't want to flood the network with useless commands
-				#
-				schedule.in('60s') do
-					do_send(command)
-				end
-				logger.info "-- Pod Computer, is refusing authentication"
-			else
-				do_send(command)
-			end
-			self[:authenticated] += 1
-			logger.debug "-- Pod Computer, requested authentication"
-		elsif data[:type] != nil
-			self["#{data[:device]}_#{data[:type]}"] = data	# zoom, tilt, pan
-			return nil	# This is out of order data
-		else
-			if !data[:result]
-				logger.warn "-- Pod Computer, request failed for command: #{command ? command[:data] : "(resp #{data})"}"
-				return false
-			end
-		end
-		
-		return true # Command success
-	end
-	
-	
-	private
-	
+    #
+    # Camera controls
+    #
+    CAM_OPERATIONS = [:up, :down, :left, :right, :center, :zoomin, :zoomout]
+    
+    #
+    # 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
+    #
+    CAM_OPERATIONS.each do |command|
+        define_method command do |*args|
+            # Cam control is low priority in case a camera is not plugged in
+            do_send({:control => "cam", :command => command.to_s, :args => []}, {:priority => 0, :retries => 0})
+        end
+    end
+    
+    def zoom(val)
+        do_send({:control => "cam", :command => "zoom", :args => [val.to_s]})
+    end
+    
+    def received(data, resolve, command)
+        
+        #
+        # Convert the message into a native object
+        #
+        data = JSON.parse(data, {:symbolize_names => true})
+        
+        #
+        # Process the response
+        #
+        if data[:command] == "authenticate"
+            command = {:control => "auth", :command => setting(:domain), :args => [setting(:username), setting(:password)]}
+            if self[:authenticated] > 0
+                #
+                # Token retry (probably always fail - at least we can see in the logs)
+                #    We don't want to flood the network with useless commands
+                #
+                schedule.in('60s') do
+                    do_send(command)
+                end
+                logger.info "-- Pod Computer, is refusing authentication"
+            else
+                do_send(command)
+            end
+            self[:authenticated] += 1
+            logger.debug "-- Pod Computer, requested authentication"
+        elsif data[:type] != nil
+            self["#{data[:device]}_#{data[:type]}"] = data    # zoom, tilt, pan
+            return nil    # This is out of order data
+        else
+            if !data[:result]
+                logger.warn "-- Pod Computer, request failed for command: #{command ? command[:data] : "(resp #{data})"}"
+                return false
+            end
+        end
+        
+        return true # Command success
+    end
+    
+    
+    private
+    
 
-	def do_send(command, options = {})
-		send("\x02#{JSON.generate(command)}\x03", options)
-	end
+    def do_send(command, options = {})
+        send("\x02#{JSON.generate(command)}\x03", options)
+    end
 end
 

data/modules/axis/camera/vapix.rb

@@ -28,8 +28,9 @@ class Axis::Camera::Vapix
         self[:tilt_min] = -180.0
         self[:tilt_center] = 0.0
 
-        self[:joy_left] = -100
-        self[:joy_right] = 100
+        # Actual limits are -100 to 100 this just improves usability
+        self[:joy_left] =  -50
+        self[:joy_right] = 50
         self[:joy_center] = 0
 
         self[:zoom_max] = 9999
@@ -84,9 +85,15 @@ class Axis::Camera::Vapix
         end
 
         options = {}
-        options[:retries] = is_centered ? 1 : 0
         options[:name] = :joystick
 
+        if is_centered
+            options[:clear_queue] = true
+        else
+            options[:priority] = 10
+            options[:retries] = 0
+        end
+
         logger.debug("Sending camera: #{pan_speed}#{tilt_speed}")
 
         req(:ptz, "continuouspantiltmove=#{pan_speed},#{tilt_speed}", options) do |data, resolve|