RubyGems - phidgets - Versions diffs - 0.0.4 → 0.0.5 - Mend

phidgets 0.0.4 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

data/History.txt CHANGED Viewed

@@ -1,3 +1,8 @@
+== 0.0.5 2010-10-28
+  * Added Manager class
+  * Added phidget executable
+  * Fixed a few bugs in the RFID class, but it is still untested.
 == 0.0.4 2010-09-10
   * Updated for compatability with Ruby 1.9
   * Removed all support for callbacks

data/Manifest.txt CHANGED Viewed

@@ -5,7 +5,10 @@ PostInstall.txt
 README.txt
 README.rdoc
 Rakefile
+bin/phidget
 lib/phidgets.rb
+lib/phidgets/phidgets.rb
+lib/phidgets/manager.rb
 lib/phidgets/common.rb
 lib/phidgets/interfacekit.rb
 lib/phidgets/rfid.rb

data/README.rdoc CHANGED Viewed

@@ -13,7 +13,7 @@ This gem provides a ruby interface to the phidgets library.
 * The gem has been tested to work on both Linux and Windows.
 * Not all the devices have been implemented, and not all of the devices that have been implemented have been fully tested.
 * The gem will attempt to guess the name of the phidgets library based on the platform it is run on (Linux, Windows or OS X).
-  If it guessesincorrectly please leave a message to let me know what your platform sets for Config::CONFIG['target_os'] and
+  If it guesses incorrectly please leave a message to let me know what your platform sets for Config::CONFIG['target_os'] and
   what is the name of the phidgets library.
 == SYNOPSIS:
@@ -34,6 +34,33 @@ This gem provides a ruby interface to the phidgets library.
   end
+  The gem now installs a command line program that will list all phidgets devices that are attached, as well as allowing any
+  valid method for a given phidget type to be called. For example:
+  To list all phidgets attached to the local computer:
+    => phidget list
+       ----------------------------------------------------------------------
+       | SerialNumber          | Device Name                                |
+       ----------------------------------------------------------------------
+       | 73723                 | Phidget InterfaceKit 0/0/8                 |
+       | 88103                 | Phidget InterfaceKit 0/0/4                 |
+       ----------------------------------------------------------------------
+  To list all phidgets attached to a remote computer:
+    => phidget 192.168.100.67 list
+       ----------------------------------------------------------------------
+       | SerialNumber          | Device Name                                |
+       ----------------------------------------------------------------------
+       | 73782                 | Phidget InterfaceKit 0/0/8                 |
+       ----------------------------------------------------------------------
+  To call a method for a specific local phidget:
+    => phidget 73723 setOutputState 0 1
+  To call a method for a specific remote phidget:
+    => phidget 192.168.100.67:73782 setOuputState 2 0
 == REQUIREMENTS:
 * The Phidgets library (http://www.phidgets.com/)

data/README.txt CHANGED Viewed

@@ -13,7 +13,7 @@ This gem provides a ruby interface to the phidgets library.
 * The gem has been tested to work on both Linux and Windows.
 * Not all the devices have been implemented, and not all of the devices that have been implemented have been fully tested.
 * The gem will attempt to guess the name of the phidgets library based on the platform it is run on (Linux, Windows or OS X).
-  If it guessesincorrectly please leave a message to let me know what your platform sets for Config::CONFIG['target_os'] and
+  If it guesses incorrectly please leave a message to let me know what your platform sets for Config::CONFIG['target_os'] and
   what is the name of the phidgets library.
 == SYNOPSIS:
@@ -34,6 +34,32 @@ This gem provides a ruby interface to the phidgets library.
   end
+  The gem now installs a command line program that will list all phidgets devices that are attached, as well as allowing any
+  valid method for a given phidget type to be called. For example:
+  To list all phidgets attached to the local computer:
+    => phidget list
+       ----------------------------------------------------------------------
+       | SerialNumber          | Device Name                                |
+       ----------------------------------------------------------------------
+       | 73723                 | Phidget InterfaceKit 0/0/8                 |
+       | 88103                 | Phidget InterfaceKit 0/0/4                 |
+       ----------------------------------------------------------------------
+  To list all phidgets attached to a remote computer:
+    => phidget 192.168.100.67 list
+       ----------------------------------------------------------------------
+       | SerialNumber          | Device Name                                |
+       ----------------------------------------------------------------------
+       | 73782                 | Phidget InterfaceKit 0/0/8                 |
+       ----------------------------------------------------------------------
+  To call a method for a specific local phidget:
+    => phidget 73723 setOutputState 0 1
+  To call a method for a specific remote phidget:
+    => phidget 192.168.100.67:73782 setOuputState 2 0
 == REQUIREMENTS:
 * The Phidgets library (http://www.phidgets.com/)

data/bin/phidget ADDED Viewed

@@ -0,0 +1,98 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'phidgets'
+def usage
+  $stdout.puts 'phidget [[host:]id] cmd [args]'
+  $stdout.puts '    host  = host name if connecting through web service'
+  $stdout.puts '    id    = serial # of phidget board (-1 for any)'
+  $stdout.puts '    cmd   = list | method'
+  $stdout.puts '    args  = arguments are dependent on the command'
+  $stdout.puts
+  $stdout.puts '  Examples:'
+  $stdout.puts '    phidget list'
+  $stdout.puts '    phidget -1 setOutputState 0 1'
+  $stdout.puts '    phidget 34619 getDeviceName'
+end
+begin
+  list = false
+  host = nil
+  id = nil
+  case ARGV[0]
+  when /^(-1|\d+)$/
+    id = $1.to_i
+  when /^(\w|.+):(-1|\d+)$/
+    host = $1
+    id = $2.to_i
+  when /^list$/i
+    list = true
+  when /^(\w|.+)$/
+    if ARGV[1].downcase == 'list'
+      list = true
+      host = $1
+    else
+      raise "Invalid Arguments."
+    end
+  else
+    raise "Invalid Arguments."
+  end
+  manager = Phidgets::Manager.new
+  if host
+    manager.openRemoteIP(host)
+  else
+    manager.open
+  end
+  devices = manager.getAttachedDevices
+  manager.close
+  if devices.count == 0
+    $stdout.puts
+    $stdout.puts 'There are no phidgets attached.'
+    $stdout.puts
+    exit
+  end
+  if list
+    $stdout.puts
+    $stdout.puts "----------------------------------------------------------------------"
+    $stdout.puts "| SerialNumber          | Device Name                                |"
+    $stdout.puts "----------------------------------------------------------------------"
+    devices.each_pair { |serial,phidget|
+      d_str = "| #{serial}"
+      d_str += " " * (24 - d_str.length)
+      d_str += "| #{phidget.getDeviceName}"
+      d_str += " " * (69 - d_str.length) + "|"
+      $stdout.puts d_str
+    }
+    $stdout.puts "----------------------------------------------------------------------"
+    $stdout.puts
+  else
+    phidget = id==-1 ? devices.first[1] :  devices[id]
+    $stdout.puts case ARGV.count
+    when 2
+      phidget.send(ARGV[1])
+    when 3
+      phidget.send(ARGV[1], ARGV[2])
+    when 4
+      phidget.send(ARGV[1], ARGV[2], ARGV[3])
+    else
+      raise "Invalid Arguments."
+    end
+  end
+rescue SystemExit
+rescue Exception => e
+  $stdout.puts "#{e}\n#{e.backtrace.join("\n")}"
+  $stdout.puts
+  usage
+  $stdout.puts
+end

data/lib/phidgets.rb CHANGED Viewed

@@ -1,11 +1,13 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+require File.dirname(__FILE__) + '/phidgets/phidgets.rb'
 require File.dirname(__FILE__) + '/phidgets/common.rb'
 require File.dirname(__FILE__) + '/phidgets/interfacekit.rb'
 require File.dirname(__FILE__) + '/phidgets/rfid.rb'
 require File.dirname(__FILE__) + '/phidgets/servo.rb'
+require File.dirname(__FILE__) + '/phidgets/manager.rb'
 module Phidgets
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/phidgets/common.rb CHANGED Viewed

@@ -1,247 +1,37 @@
-require 'dl'
-require 'dl/import'
-require 'rbconfig'
 module Phidgets
-  if RUBY_VERSION < "1.9"
-    extend DL::Importable
-    SIZEOF_INT      = DL.sizeof('I')
-    SIZEOF_VOIDP    = DL.sizeof('P')
-    SIZEOF_DOUBLE   = DL.sizeof('D')
-    FUNCTION_PREFIX = 'c'
-    def Phidgets.malloc size
-      DL.malloc(size)
-    end
-  else
-    extend DL::Importer
-    SIZEOF_INT      = DL::SIZEOF_INT
-    SIZEOF_VOIDP    = DL::SIZEOF_VOIDP
-    SIZEOF_DOUBLE   = DL::SIZEOF_DOUBLE
-    FUNCTION_PREFIX = 'C'
-    def Phidgets.malloc size
-      DL::CPtr.malloc(size)
-    end
-  end
-  PFALSE                           = 0
-  PTRUE                            = 1
-  NOTATTACHED                      = 0
-  ATTACHED                         = 1
-  CLASS_NOTHING                    = 1
-  CLASS_ACCELEROMETER              = 2
-  CLASS_ADVANCEDSERVO              = 3
-  CLASS_ENCODER                    = 4
-  CLASS_GPS                        = 5
-  CLASS_GYROSCOPE                  = 6
-  CLASS_INTERFACEKIT               = 7
-  CLASS_LED                        = 8
-  CLASS_MOTORCONTROL               = 9
-  CLASS_PHSENSOR                   = 10
-  CLASS_RFID                       = 11
-  CLASS_SERVO                      = 12
-  CLASS_STEPPER                    = 13
-  CLASS_TEMPERATURESENSOR          = 14
-  CLASS_TEXTLCD                    = 15
-  CLASS_TEXTLED                    = 16
-  CLASS_WEIGHTSENSOR               = 17
-  ID_ACCELEROMETER_2AXIS           = 0x071
-  ID_ACCELEROMETER_3AXIS           = 0x07E
-  ID_ADVANCEDSERVO_8MOTOR          = 0x03A
-  ID_BIPOLAR_STEPPER_1MOTOR        = 0x07B
-  ID_ENCODER_1ENCODER_1INPUT       = 0x04B
-  ID_ENCODER_HS_1ENCODER           = 0x080
-  ID_INTERFACEKIT_0_0_4            = 0x040
-  ID_INTERFACEKIT_0_0_8            = 0x081
-  ID_INTERFACEKIT_0_16_16          = 0x044
-  ID_INTERFACEKIT_8_8_8            = 0x045
-  ID_INTERFACEKIT_8_8_8_w_LCD      = 0x07D
-  ID_LED_64                        = 0x04A
-  ID_LINEAR_TOUCH                  = 0x076
-  ID_MOTORCONTROL_HC_2MOTOR        = 0x059
-  ID_MOTORCONTROL_LV_2MOTOR_4INPUT = 0x058
-  ID_PHSENSOR                      = 0x074
-  ID_RFID_2OUTPUT                  = 0x031
-  ID_ROTARY_TOUCH                  = 0x077
-  ID_SERVO_1MOTOR                  = 0x039
-  ID_TEMPERATURESENSOR             = 0x070
-  ID_TEXTLCD_2x20_w_8_8_8          = 0x17D
-  ID_UNIPOLAR_STEPPER_4MOTOR       = 0x07A
-  ID_INTERFACEKIT_0_8_8_w_LCD      = 0x053
-  ID_INTERFACEKIT_4_8_8            = 0x004
-  ID_RFID                          = 0x030
-  ID_SERVO_1MOTOR_OLD              = 0x002
-  ID_SERVO_4MOTOR                  = 0x038
-  ID_SERVO_4MOTOR_OLD              = 0x003
-  ID_TEXTLCD_2x20                  = 0x052
-  ID_TEXTLCD_2x20_w_0_8_8          = 0x153
-  ID_TEXTLED_1x8                   = 0x049
-  ID_TEXTLED_4x8                   = 0x048
-  ID_WEIGHTSENSOR                  = 0x072
-  PHIDGET_LOG_CRITICAL             = 1
-  PHIDGET_LOG_ERROR                = 2
-  PHIDGET_LOG_WARNING              = 3
-  PHIDGET_LOG_DEBUG                = 4
-  PHIDGET_LOG_INFO                 = 5
-  PHIDGET_LOG_VERBOSE              = 6
-  class Exception < RuntimeError
-    attr_reader :code
-    EPHIDGET_LOAD_LIB_FAIL         = -2
-    EPHIDGET_LIBNAME               = -1
-    EPHIDGET_NOTFOUND              = 1
-    EPHIDGET_NOMEMORY              = 2
-    EPHIDGET_UNEXPECTED            = 3
-    EPHIDGET_INVALIDARG            = 4
-    EPHIDGET_NOTATTACHED           = 5
-    EPHIDGET_INTERRUPTED           = 6
-    EPHIDGET_INVALID               = 7
-    EPHIDGET_NETWORK               = 8
-    EPHIDGET_UNKNOWNVAL            = 9
-    EPHIDGET_BADPASSWORD           = 10
-    EPHIDGET_UNSUPPORTED           = 11
-    EPHIDGET_DUPLICATE             = 12
-    EPHIDGET_TIMEOUT               = 13
-    EPHIDGET_OUTOFBOUNDS           = 14
-    EPHIDGET_EVENT                 = 15
-    EPHIDGET_NETWORK_NOTCONNECTED  = 16
-    EPHIDGET_WRONGDEVICE           = 17
-    EPHIDGET_CLOSED                = 18
-    EPHIDGET_BADVERSION            = 19
-    def initialize(code)
-      @code = code
-      case code
-        when EPHIDGET_LOAD_LIB_FAIL
-          super('Failed to load Phidgets Library')
-        when EPHIDGET_LIBNAME
-          super('Unable to determine Phidgets Library name.')
-        when EPHIDGET_NOTFOUND
-          super('A Phidget matching the type and or serial number could not be found.')
-        when EPHIDGET_NOMEMORY
-          super('Memory could not be allocated.')
-        when EPHIDGET_UNEXPECTED
-          super('Unexpected Error. Contact Phidgets Inc. for support.')
-        when EPHIDGET_INVALIDARG
-          super('Invalid argument passed to function.')
-        when EPHIDGET_NOTATTACHED
-          super('Phidget not physically attached.')
-        when EPHIDGET_INTERRUPTED
-          super('Read/Write operation was interrupted.')
-        when EPHIDGET_INVALID
-          super('The Error Code is not defined.')
-        when EPHIDGET_NETWORK
-          super('Network Error.')
-        when EPHIDGET_UNKNOWNVAL
-          super('Value is Unknown (State not yet received from device, or not yet set by user).')
-        when EPHIDGET_BADPASSWORD
-          super('Authorization Failed.')
-        when EPHIDGET_UNSUPPORTED
-          super('Not Supported.')
-        when EPHIDGET_DUPLICATE
-          super('Duplicated request.')
-        when EPHIDGET_TIMEOUT
-          super('Given timeout has been exceeded.')
-        when EPHIDGET_OUTOFBOUNDS
-          super('Index out of Bounds.')
-        when EPHIDGET_EVENT
-          super('A non-null error code was returned from an event handler.')
-        when EPHIDGET_NETWORK_NOTCONNECTED
-          super('A connection to the server does not exist.')
-        when EPHIDGET_WRONGDEVICE
-          super('Function is not applicable for this device.')
-        when EPHIDGET_CLOSED
-          super('Phidget handle was closed.')
-        when EPHIDGET_BADVERSION
-          super("Webservice and Client protocol versions don't match. Update to newest release.")
-      end
-    end
-  end
-  begin
-    case Config::CONFIG['target_os']
-      when /linux/
-        dlload 'libphidget21.so'
-      when /mswin/, /mingw/
-        dlload 'phidget21.dll'
-      when /darwin/
-        dlload '/Library/Frameworks/Phidget21.framework/Versions/Current/Phidget21'
-      else
-        raise Phidgets::Exception.new(Exception::EPHIDGET_LIBNAME)
-    end
-  rescue
-    raise Phidgets::Exception.new(Exception::EPHIDGET_LOAD_LIB_FAIL)
-  end
+  extern "int CPhidget_open(void *, int)"
   extern "int CPhidget_openRemote(void *, int, void *, void *)"
   extern "int CPhidget_openRemoteIP(void *, int, void *, int, void *)"
-  extern "int CPhidget_open(void *, int)"
   extern "int CPhidget_close(void *)"
   extern "int CPhidget_delete(void *)"
   extern "int CPhidget_getDeviceName(void *, void *)"
   extern "int CPhidget_getSerialNumber(void *, int *)"
   extern "int CPhidget_getDeviceVersion(void *, int *)"
   extern "int CPhidget_getDeviceStatus(void *, int *)"
-  extern "int CPhidget_getLibraryVersion(void *)"
   extern "int CPhidget_getDeviceType(void *, void *)"
   extern "int CPhidget_getDeviceLabel(void *, void *)"
   extern "int CPhidget_setDeviceLabel(void *, void *)"
-  extern "int CPhidget_getErrorDescription(int, void *)"
   extern "int CPhidget_waitForAttachment(void *, int)"
   extern "int CPhidget_getServerID(void *, void *)"
   extern "int CPhidget_getServerAddress(void *, void *, int *)"
   extern "int CPhidget_getServerStatus(void *, int *)"
   extern "int CPhidget_getDeviceID(void *, int *)"
   extern "int CPhidget_getDeviceClass(void *, int *)"
-  extern "int CPhidget_enableLogging(int, char *)"
-  extern "int CPhidget_disableLogging()"
-  # Gets the library version. This contains a version number and a build date.
-  def Phidgets.getLibraryVersion
-    ptr = malloc(SIZEOF_VOIDP)
-    r = self.send(FUNCTION_PREFIX + 'Phidget_getLibraryVersion', ptr.ref)
-    raise Phidgets::Exception.new(r) if r != 0
-    ptr.free = nil
-    ptr.to_s
-  end
-  # Gets the description for an error code.
-  def Phidgets.getErrorDescription(error_code)
-    ptr = malloc(SIZEOF_VOIDP)
-    r = self.send(FUNCTION_PREFIX + 'Phidget_getErrorDescription', error_code, ptr.ref)
-    raise Phidgets::Exception.new(r) if r != 0
-    ptr.free = nil
-    ptr.to_s
-  end
-  # Enables logging. Logging is provided mainly for debugging purposes. Enabling logging will output internal library
-  # information that can be used to find bugs with the help of Phidgetd Inc. Alternatively, the user can enable
-  # and write to the log for their own uses.
-  # === Parameters
-  # * _level_ = The highest level of logging to output. All lower levels will also be output.
-  # * _file_  = File to output log to. This should be a full pathname, not a relative pathname.
-  def Phidgets.enableLogging(level, file)
-    r = self.send(FUNCTION_PREFIX + 'Phidget_enableLogging', level, file)
-    raise Phidgets::Exception.new(r) if r != 0
-  end
-  # Disables logging.
-  def Phidgets.disableLogging
-    r = self.send(FUNCTION_PREFIX + 'Phidget_disableLogging')
-    raise Phidgets::Exception.new(r) if r != 0
-  end
   class Common
+    # Opens a Phidget.
+    # === Parameters
+    # * _serial_number_ = Serial number. Specify -1 to open any.
+    # * _timeout_       = Time to wait for attachment. Specify 0 to not wait.
+    def open(serial_number=-1, timeout=0)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_open', @handle, serial_number.to_i)
+      raise Phidgets::Exception.new(r) if r != 0
+      waitForAttachment(timeout) if timeout > 0
+    end
     # Opens a Phidget remotely by ServerID. Note that this requires Bonjour (mDNS) to be running on both the host and the server.
     # === Parameters
     # * _serial_number_ = Serial number. Specify -1 to open any.
@@ -249,7 +39,7 @@ module Phidgets
     # * _password_      = Password. Can be nil if the server is running unsecured.
     # * _timeout_       = Time to wait for attachment. Specify 0 to not wait.
     def openRemote(serial_number=-1, server=nil, password=nil, timeout=0)
-      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_openRemote', @handle, serial_number, server, password)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_openRemote', @handle, serial_number.to_i, server, password)
       raise Phidgets::Exception.new(r) if r != 0
       waitForAttachment(timeout) if timeout > 0
     end
@@ -262,17 +52,7 @@ module Phidgets
     # * _password_      = Password. Can be nil if the server is running unsecured.
     # * _timeout_       = Time to wait for attachment. Specify 0 to not wait.
     def openRemoteIP(serial_number, address, port=5001, password=nil, timeout=0)
-      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_openRemoteIP', @handle, serial_number, address, port, password)
-      raise Phidgets::Exception.new(r) if r != 0
-      waitForAttachment(timeout) if timeout > 0
-    end
-    # Opens a Phidget.
-    # === Parameters
-    # * _serial_number_ = Serial number. Specify -1 to open any.
-    # * _timeout_       = Time to wait for attachment. Specify 0 to not wait.
-    def open(serial_number=-1, timeout=0)
-      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_open', @handle, serial_number)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_openRemoteIP', @handle, serial_number.to_i, address, port.to_i, password)
       raise Phidgets::Exception.new(r) if r != 0
       waitForAttachment(timeout) if timeout > 0
     end
@@ -356,7 +136,7 @@ module Phidgets
     # === Parameters
     # * _timeout_ = Time to wait for the attachment. Specify 0 to wait forever.
     def waitForAttachment(timeout)
-      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_waitForAttachment', @handle, timeout)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_waitForAttachment', @handle, timeout.to_i)
       raise Phidgets::Exception.new(r) if r != 0
     end

data/lib/phidgets/interfacekit.rb CHANGED Viewed

@@ -17,7 +17,7 @@ module Phidgets
   class InterfaceKit < Common
-    # Create a new interface kit object.
+    # Create a new InterfaceKit object.
     # === Parameters
     # * _serial_number_ = Serial number of the phidget board to open. Specify -1 to open any.
     # * _timeout_       = Time to wait for attachment. Specify 0 to not call open.
@@ -41,7 +41,7 @@ module Phidgets
     # * _index_ = The input index.
     def getInputState(index)
       state = Phidgets.malloc(SIZEOF_INT)
-      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_getInputState', @handle, index, state.ref)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_getInputState', @handle, index.to_i, state.ref)
       raise Phidgets::Exception.new(r) if r != 0
       state.free = nil
       state.to_i
@@ -61,7 +61,7 @@ module Phidgets
     # * _index_ = The output index.
     def getOutputState(index)
       state = Phidgets.malloc(SIZEOF_INT)
-      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_getOutputState', @handle, index, state.ref)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_getOutputState', @handle, index.to_i, state.ref)
       raise Phidgets::Exception.new(r) if r != 0
       state.free = nil
       state.to_i
@@ -70,9 +70,9 @@ module Phidgets
     # Sets the state of a digital output.
     # === Parameters
     # * _index_ = The output index.
-    # * _state_ = The output state. Possible values are PTRUE  and PFALSE.
+    # * _state_ = The output state. Possible values are PTRUE and PFALSE.
     def setOutputState(index, state)
-      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_setOutputState', @handle, index, state)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_setOutputState', @handle, index.to_i, state.to_i)
       raise Phidgets::Exception.new(r) if r != 0
     end
@@ -90,7 +90,7 @@ module Phidgets
     # * _index_ = The sensor index.
     def getSensorValue(index)
       state = Phidgets.malloc(SIZEOF_INT)
-      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_getSensorValue', @handle, index, state.ref)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_getSensorValue', @handle, index.to_i, state.ref)
       raise Phidgets::Exception.new(r) if r != 0
       state.free = nil
       state.to_i
@@ -101,7 +101,7 @@ module Phidgets
     # * _index_ = The sensor index.
     def getSensorRawValue(index)
       state = Phidgets.malloc(SIZEOF_INT)
-      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_getSensorRawValue', @handle, index, state.ref)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_getSensorRawValue', @handle, index.to_i, state.ref)
       raise Phidgets::Exception.new(r) if r != 0
       state.free = nil
       state.to_i
@@ -120,7 +120,7 @@ module Phidgets
     # === Parameters
     # * _ratiometric_ = The ratiometric state. Possible values are PTRUE  and PFALSE.
     def setRatiometric(ratiometric)
-      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_setRatiometric', @handle, ratiometric)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_setRatiometric', @handle, ratiometric.to_i)
       raise Phidgets::Exception.new(r) if r != 0
     end

data/lib/phidgets/manager.rb ADDED Viewed

@@ -0,0 +1,132 @@
+module Phidgets
+  extern "int CPhidgetManager_create(void *)"
+  extern "int CPhidgetManager_open(void *)"
+  extern "int CPhidgetManager_close(void *)"
+  extern "int CPhidgetManager_delete(void *)"
+  extern "int CPhidgetManager_getAttachedDevices(void *, void *, int *)"
+  extern "int CPhidgetManager_freeAttachedDevicesArray(void *)"
+  extern "int CPhidgetManager_openRemote(void *, void *, void *)"
+  extern "int CPhidgetManager_openRemoteIP(void *, char *, int, void *)"
+  class Manager
+    # Creates a new Manager object.
+    def initialize
+      @server = nil
+      @port = nil
+      @password = nil
+      @handle = Phidgets.malloc(SIZEOF_VOIDP)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetManager_create', @handle.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+    end
+    # Opens a Manager.
+    def open
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetManager_open', @handle)
+      raise Phidgets::Exception.new(r) if r != 0
+      # a delay is required between the time the manager is opened and when it is used, otherwise it will report that no phidgets are attached. there really should be a better way.
+      sleep 1
+    end
+    # Opens a Manager remotely by ServerID. Note that this requires Bonjour (mDNS) to be running on both the host and the server.
+    # === Parameters
+    # * _server_        = Server ID. Specify nil to open any.
+    # * _password_      = Password. Can be nil if the server is running unsecured.
+    def openRemote(server=nil, password=nil)
+      @server = server
+      @password = password
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetManager_openRemote', @handle, server, password)
+      raise Phidgets::Exception.new(r) if r != 0
+      # a delay is required between the time the manager is opened and when it is used, otherwise it will report that no phidgets are attached. there really should be a better way.
+      sleep 2
+    end
+    # Opens a Manager remotely by address and port.
+    # === Parameters
+    # * _address_       = Address. This can be a hostname or IP address.
+    # * _port_          = Port number. Default is 5001.
+    # * _password_      = Password. Can be nil if the server is running unsecured.
+    def openRemoteIP(address, port=5001, password=nil)
+      @server = address
+      @port = port.to_i
+      @password = password
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetManager_openRemoteIP', @handle, address, port.to_i, password)
+      raise Phidgets::Exception.new(r) if r != 0
+      # a delay is required between the time the manager is opened and when it is used, otherwise it will report that no phidgets are attached. there really should be a better way.
+      sleep 2
+    end
+    # Closes a Manager.
+    def close
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetManager_close', @handle)
+      raise Phidgets::Exception.new(r) if r != 0
+    end
+    # Frees a Manager handle.
+    def delete
+      @handle.free = nil
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetManager_delete', @handle)
+      raise Phidgets::Exception.new(r) if r != 0
+    end
+    # Gets a hash of all currently attached Phidgets. The indices into the hash are the serial numbers of the Phidgets.
+    def getAttachedDevices
+      handles = Phidgets.malloc(SIZEOF_VOIDP)
+      count = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetManager_getAttachedDevices', @handle, handles.ref, count.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      count.free = nil
+      devices = {}
+      count.to_i.times { |i|
+        handle = handles + (i * SIZEOF_VOIDP)
+        serial = getSerialNumber(handle)
+        devices[serial] = case getDeviceClass(handle)
+        when CLASS_INTERFACEKIT
+          InterfaceKit.new
+        when CLASS_RFID
+          RFID.new
+        when CLASS_SERVO
+          Servo.new
+        end
+        devices[serial].open(serial, 3000) unless @server
+        devices[serial].openRemote(serial, @server, @password, 4000) if @server and !@port
+        devices[serial].openRemoteIP(serial, @server, @port, @password, 4000) if @server and @port
+      }
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetManager_freeAttachedDevicesArray', handles)
+      raise Phidgets::Exception.new(r) if r != 0
+      devices
+    end
+    private
+    def getDeviceClass handle
+      dev_class = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_getDeviceClass', handle.ptr, dev_class.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      dev_class.free = nil
+      dev_class.to_i
+    end
+    def getSerialNumber handle
+      sn = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_getSerialNumber', handle.ptr, sn.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      sn.free = nil
+      sn.to_i
+    end
+  end
+end

data/lib/phidgets/phidgets.rb ADDED Viewed

@@ -0,0 +1,225 @@
+require 'dl'
+require 'dl/import'
+require 'rbconfig'
+module Phidgets
+  if RUBY_VERSION < "1.9"
+    extend DL::Importable
+    SIZEOF_INT      = DL.sizeof('I')
+    SIZEOF_VOIDP    = DL.sizeof('P')
+    SIZEOF_DOUBLE   = DL.sizeof('D')
+    FUNCTION_PREFIX = 'c'
+    def Phidgets.malloc size
+      DL.malloc(size)
+    end
+  else
+    extend DL::Importer
+    SIZEOF_INT      = DL::SIZEOF_INT
+    SIZEOF_VOIDP    = DL::SIZEOF_VOIDP
+    SIZEOF_DOUBLE   = DL::SIZEOF_DOUBLE
+    FUNCTION_PREFIX = 'C'
+    def Phidgets.malloc size
+      DL::CPtr.malloc(size)
+    end
+  end
+  PFALSE                           = 0
+  PTRUE                            = 1
+  NOTATTACHED                      = 0
+  ATTACHED                         = 1
+  CLASS_NOTHING                    = 1
+  CLASS_ACCELEROMETER              = 2
+  CLASS_ADVANCEDSERVO              = 3
+  CLASS_ENCODER                    = 4
+  CLASS_GPS                        = 5
+  CLASS_GYROSCOPE                  = 6
+  CLASS_INTERFACEKIT               = 7
+  CLASS_LED                        = 8
+  CLASS_MOTORCONTROL               = 9
+  CLASS_PHSENSOR                   = 10
+  CLASS_RFID                       = 11
+  CLASS_SERVO                      = 12
+  CLASS_STEPPER                    = 13
+  CLASS_TEMPERATURESENSOR          = 14
+  CLASS_TEXTLCD                    = 15
+  CLASS_TEXTLED                    = 16
+  CLASS_WEIGHTSENSOR               = 17
+  ID_ACCELEROMETER_2AXIS           = 0x071
+  ID_ACCELEROMETER_3AXIS           = 0x07E
+  ID_ADVANCEDSERVO_8MOTOR          = 0x03A
+  ID_BIPOLAR_STEPPER_1MOTOR        = 0x07B
+  ID_ENCODER_1ENCODER_1INPUT       = 0x04B
+  ID_ENCODER_HS_1ENCODER           = 0x080
+  ID_INTERFACEKIT_0_0_4            = 0x040
+  ID_INTERFACEKIT_0_0_8            = 0x081
+  ID_INTERFACEKIT_0_16_16          = 0x044
+  ID_INTERFACEKIT_8_8_8            = 0x045
+  ID_INTERFACEKIT_8_8_8_w_LCD      = 0x07D
+  ID_LED_64                        = 0x04A
+  ID_LINEAR_TOUCH                  = 0x076
+  ID_MOTORCONTROL_HC_2MOTOR        = 0x059
+  ID_MOTORCONTROL_LV_2MOTOR_4INPUT = 0x058
+  ID_PHSENSOR                      = 0x074
+  ID_RFID_2OUTPUT                  = 0x031
+  ID_ROTARY_TOUCH                  = 0x077
+  ID_SERVO_1MOTOR                  = 0x039
+  ID_TEMPERATURESENSOR             = 0x070
+  ID_TEXTLCD_2x20_w_8_8_8          = 0x17D
+  ID_UNIPOLAR_STEPPER_4MOTOR       = 0x07A
+  ID_INTERFACEKIT_0_8_8_w_LCD      = 0x053
+  ID_INTERFACEKIT_4_8_8            = 0x004
+  ID_RFID                          = 0x030
+  ID_SERVO_1MOTOR_OLD              = 0x002
+  ID_SERVO_4MOTOR                  = 0x038
+  ID_SERVO_4MOTOR_OLD              = 0x003
+  ID_TEXTLCD_2x20                  = 0x052
+  ID_TEXTLCD_2x20_w_0_8_8          = 0x153
+  ID_TEXTLED_1x8                   = 0x049
+  ID_TEXTLED_4x8                   = 0x048
+  ID_WEIGHTSENSOR                  = 0x072
+  PHIDGET_LOG_CRITICAL             = 1
+  PHIDGET_LOG_ERROR                = 2
+  PHIDGET_LOG_WARNING              = 3
+  PHIDGET_LOG_DEBUG                = 4
+  PHIDGET_LOG_INFO                 = 5
+  PHIDGET_LOG_VERBOSE              = 6
+  class Exception < RuntimeError
+    attr_reader :code
+    EPHIDGET_LOAD_LIB_FAIL         = -2
+    EPHIDGET_LIBNAME               = -1
+    EPHIDGET_NOTFOUND              = 1
+    EPHIDGET_NOMEMORY              = 2
+    EPHIDGET_UNEXPECTED            = 3
+    EPHIDGET_INVALIDARG            = 4
+    EPHIDGET_NOTATTACHED           = 5
+    EPHIDGET_INTERRUPTED           = 6
+    EPHIDGET_INVALID               = 7
+    EPHIDGET_NETWORK               = 8
+    EPHIDGET_UNKNOWNVAL            = 9
+    EPHIDGET_BADPASSWORD           = 10
+    EPHIDGET_UNSUPPORTED           = 11
+    EPHIDGET_DUPLICATE             = 12
+    EPHIDGET_TIMEOUT               = 13
+    EPHIDGET_OUTOFBOUNDS           = 14
+    EPHIDGET_EVENT                 = 15
+    EPHIDGET_NETWORK_NOTCONNECTED  = 16
+    EPHIDGET_WRONGDEVICE           = 17
+    EPHIDGET_CLOSED                = 18
+    EPHIDGET_BADVERSION            = 19
+    def initialize(code)
+      @code = code
+      case code
+        when EPHIDGET_LOAD_LIB_FAIL
+          super('Failed to load Phidgets Library')
+        when EPHIDGET_LIBNAME
+          super('Unable to determine Phidgets Library name.')
+        when EPHIDGET_NOTFOUND
+          super('A Phidget matching the type and or serial number could not be found.')
+        when EPHIDGET_NOMEMORY
+          super('Memory could not be allocated.')
+        when EPHIDGET_UNEXPECTED
+          super('Unexpected Error. Contact Phidgets Inc. for support.')
+        when EPHIDGET_INVALIDARG
+          super('Invalid argument passed to function.')
+        when EPHIDGET_NOTATTACHED
+          super('Phidget not physically attached.')
+        when EPHIDGET_INTERRUPTED
+          super('Read/Write operation was interrupted.')
+        when EPHIDGET_INVALID
+          super('The Error Code is not defined.')
+        when EPHIDGET_NETWORK
+          super('Network Error.')
+        when EPHIDGET_UNKNOWNVAL
+          super('Value is Unknown (State not yet received from device, or not yet set by user).')
+        when EPHIDGET_BADPASSWORD
+          super('Authorization Failed.')
+        when EPHIDGET_UNSUPPORTED
+          super('Not Supported.')
+        when EPHIDGET_DUPLICATE
+          super('Duplicated request.')
+        when EPHIDGET_TIMEOUT
+          super('Given timeout has been exceeded.')
+        when EPHIDGET_OUTOFBOUNDS
+          super('Index out of Bounds.')
+        when EPHIDGET_EVENT
+          super('A non-null error code was returned from an event handler.')
+        when EPHIDGET_NETWORK_NOTCONNECTED
+          super('A connection to the server does not exist.')
+        when EPHIDGET_WRONGDEVICE
+          super('Function is not applicable for this device.')
+        when EPHIDGET_CLOSED
+          super('Phidget handle was closed.')
+        when EPHIDGET_BADVERSION
+          super("Webservice and Client protocol versions don't match. Update to newest release.")
+      end
+    end
+  end
+  begin
+    case Config::CONFIG['target_os']
+      when /linux/
+        dlload 'libphidget21.so'
+      when /mswin/, /mingw/
+        dlload 'phidget21.dll'
+      when /darwin/
+        dlload '/Library/Frameworks/Phidget21.framework/Versions/Current/Phidget21'
+      else
+        raise Phidgets::Exception.new(Exception::EPHIDGET_LIBNAME)
+    end
+  rescue
+    raise Phidgets::Exception.new(Exception::EPHIDGET_LOAD_LIB_FAIL)
+  end
+  extern "int CPhidget_getLibraryVersion(void *)"
+  extern "int CPhidget_getErrorDescription(int, void *)"
+  extern "int CPhidget_enableLogging(int, char *)"
+  extern "int CPhidget_disableLogging()"
+  # Gets the library version. This contains a version number and a build date.
+  def Phidgets.getLibraryVersion
+    ptr = malloc(SIZEOF_VOIDP)
+    r = self.send(FUNCTION_PREFIX + 'Phidget_getLibraryVersion', ptr.ref)
+    raise Phidgets::Exception.new(r) if r != 0
+    ptr.free = nil
+    ptr.to_s
+  end
+  # Gets the description for an error code.
+  def Phidgets.getErrorDescription(error_code)
+    ptr = malloc(SIZEOF_VOIDP)
+    r = self.send(FUNCTION_PREFIX + 'Phidget_getErrorDescription', error_code.to_i, ptr.ref)
+    raise Phidgets::Exception.new(r) if r != 0
+    ptr.free = nil
+    ptr.to_s
+  end
+  # Enables logging. Logging is provided mainly for debugging purposes. Enabling logging will output internal library
+  # information that can be used to find bugs with the help of Phidgetd Inc. Alternatively, the user can enable
+  # and write to the log for their own uses.
+  # === Parameters
+  # * _level_ = The highest level of logging to output. All lower levels will also be output.
+  # * _file_  = File to output log to. This should be a full pathname, not a relative pathname.
+  def Phidgets.enableLogging(level, file)
+    r = self.send(FUNCTION_PREFIX + 'Phidget_enableLogging', level.to_i, file)
+    raise Phidgets::Exception.new(r) if r != 0
+  end
+  # Disables logging.
+  def Phidgets.disableLogging
+    r = self.send(FUNCTION_PREFIX + 'Phidget_disableLogging')
+    raise Phidgets::Exception.new(r) if r != 0
+  end
+end

data/lib/phidgets/rfid.rb CHANGED Viewed

@@ -5,18 +5,18 @@ module Phidgets
   extern "int CPhidgetRFID_create(void *)"
   extern "int CPhidgetRFID_getOutputCount(void *, int *)"
   extern "int CPhidgetRFID_getOutputState(void *, int, int *)"
-  extern "int CPhidgetRFID_setOutputState(void *, int *)"
-  extern "int CPhidgetRFID_getAntennaOn(void *, int, int *)"
-  extern "int CPhidgetRFID_setAntennaOn(void *, int, int)"
+  extern "int CPhidgetRFID_setOutputState(void *, int, int)"
+  extern "int CPhidgetRFID_getAntennaOn(void *, int *)"
+  extern "int CPhidgetRFID_setAntennaOn(void *, int)"
   extern "int CPhidgetRFID_getLEDOn(void *, int *)"
-  extern "int CPhidgetRFID_setLEDOn(void *, int, int *)"
-  extern "int CPhidgetRFID_getLastTag(void *, int, int *)"
+  extern "int CPhidgetRFID_setLEDOn(void *, int)"
+  extern "int CPhidgetRFID_getLastTag(void *, void *)"
   extern "int CPhidgetRFID_getTagStatus(void *, int *)"
   class RFID < Common
-    # Create a new rfid object.
+    # Create a new RFID object.
     # === Parameters
     # * _serial_number_ = Serial number of the phidget board to open. Specify -1 to open any.
     # * _timeout_       = Time to wait for attachment. Specify 0 to not call open.
@@ -40,7 +40,7 @@ module Phidgets
     # * _index_ = The output index.
     def getOutputState(index)
       state = Phidgets.malloc(SIZEOF_INT)
-      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_getOutputState', @handle, index, state.ref)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_getOutputState', @handle, index.to_i, state.ref)
       raise Phidgets::Exception.new(r) if r != 0
       state.free = nil
       state.to_i
@@ -51,7 +51,7 @@ module Phidgets
     # * _index_ = The output index.
     # * _state_ = The output state. Possible values are PTRUE  and PFALSE.
     def setOutputState(index, state)
-      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_setOutputState', @handle, index, state)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_setOutputState', @handle, index.to_i, state.to_i)
       raise Phidgets::Exception.new(r) if r != 0
     end
@@ -68,7 +68,7 @@ module Phidgets
     # === Parameters
     # * _state_ = The antenna state. Possible values are PTRUE  and PFALSE.
     def setAntennaOn(state)
-      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_setAntennaOn', @handle, state)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_setAntennaOn', @handle, state.to_i)
       raise Phidgets::Exception.new(r) if r != 0
     end
@@ -85,16 +85,17 @@ module Phidgets
     # === Parameters
     # * _state_ = The LED state. Possible values are PTRUE  and PFALSE.
     def setLedOn(state)
-      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_setLEDOn', @handle, state)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_setLEDOn', @handle, state.to_i)
       raise Phidgets::Exception.new(r) if r != 0
     end
     # Gets the last tag read by the reader. This tag may or may not still be on the reader.
     def getLastTag
-      tag = Phidgets.malloc(5)
-      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_getLastTag', @handle, tag)
+      tag = Phidgets.malloc(SIZEOF_VOIDP)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_getLastTag', @handle, tag.ref)
       raise Phidgets::Exception.new(r) if r != 0
-      tag
+      tag.free = nil
+      tag.to_s
     end
     # Gets the tag present status. This is whether or not a tag is being read by the reader.

data/lib/phidgets/servo.rb CHANGED Viewed

@@ -12,7 +12,7 @@ module Phidgets
   class Servo < Common
-    # Create a new servo object.
+    # Create a new Servo object.
     # === Parameters
     # * _serial_number_ = Serial number of the phidget board to open. Specify -1 to open any.
     # * _timeout_       = Time to wait for attachment. Specify 0 to not call open.
@@ -36,7 +36,7 @@ module Phidgets
     # * _index_ = The motor index.
     def getPosition(index)
       pos = Phidgets.malloc(SIZEOF_DOUBLE)
-      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_getPosition', @handle, index, pos.ref)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_getPosition', @handle, index.to_i, pos.ref)
       raise Phidgets::Exception.new(r) if r != 0
       pos.free = nil
       pos.to_f
@@ -47,7 +47,7 @@ module Phidgets
     # * _index_   = The motor index.
     # * _position = The motor position.
     def setPosition(index, position)
-      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_setPosition', @handle, index, position)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_setPosition', @handle, index.to_i, position.to_f)
       raise Phidgets::Exception.new(r) if r != 0
     end
@@ -56,7 +56,7 @@ module Phidgets
     # * _index_ = The motor index.
     def getPositionMax(index)
       pos = Phidgets.malloc(SIZEOF_DOUBLE)
-      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_getPositionMax', @handle, index, pos.ref)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_getPositionMax', @handle, index.to_i, pos.ref)
       raise Phidgets::Exception.new(r) if r != 0
       pos.free = nil
       pos.to_f
@@ -67,7 +67,7 @@ module Phidgets
     # * _index_ = The motor index.
     def getPositionMin(index)
       pos = Phidgets.malloc(SIZEOF_DOUBLE)
-      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_getPositionMin', @handle, index, pos.ref)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_getPositionMin', @handle, index.to_i, pos.ref)
       raise Phidgets::Exception.new(r) if r != 0
       pos.free = nil
       pos.to_f
@@ -78,7 +78,7 @@ module Phidgets
     # * _index_ = The motor index.
     def getEngaged(index)
       eng = Phidgets.malloc(SIZEOF_INT)
-      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_getEngaged', @handle, index, eng.ref)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_getEngaged', @handle, index.to_i, eng.ref)
       raise Phidgets::Exception.new(r) if r != 0
       eng.free = nil
       eng.to_i
@@ -89,7 +89,7 @@ module Phidgets
     # * _index_ = The motor index.
     # * _state_ = The engaged state. Possible values are PTRUE  and PFALSE.
     def setEngaged(index, state)
-      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_setEngaged', @handle, index, state)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_setEngaged', @handle, index.to_i, state.to_i)
       raise Phidgets::Exception.new(r) if r != 0
     end

metadata CHANGED Viewed

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phidgets
 version: !ruby/object:Gem::Version
-  prerelease: false
-  segments:
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Craig DeHaan
@@ -14,44 +9,36 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-09-14 00:00:00 -04:00
+date: 2010-09-29 00:00:00 -04:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyforge
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement
+  type: :development
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        segments:
-        - 2
-        - 0
-        - 4
         version: 2.0.4
-  type: :development
-  version_requirements: *id001
+    version:
 - !ruby/object:Gem::Dependency
   name: hoe
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement
+  type: :development
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        segments:
-        - 2
-        - 6
-        - 0
         version: 2.6.0
-  type: :development
-  version_requirements: *id002
+    version:
 description: |-
   Phidgets are a set of "plug and play" building blocks for low cost USB sensing and control from your PC.
   This gem provides a ruby interface to the phidgets library.
 email:
 - craig.s.dehaan@gmail.com
-executables: []
+executables:
+- phidget
 extensions: []
 extra_rdoc_files:
@@ -68,7 +55,10 @@ files:
 - README.txt
 - README.rdoc
 - Rakefile
+- bin/phidget
 - lib/phidgets.rb
+- lib/phidgets/phidgets.rb
+- lib/phidgets/manager.rb
 - lib/phidgets/common.rb
 - lib/phidgets/interfacekit.rb
 - lib/phidgets/rfid.rb
@@ -93,24 +83,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      segments:
-      - 0
       version: "0"
+  version:
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      segments:
-      - 0
       version: "0"
+  version:
 requirements: []
 rubyforge_project: phidgets
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key:
 specification_version: 3
 summary: Phidgets are a set of "plug and play" building blocks for low cost USB sensing and control from your PC
 test_files:
-- test/test_interfacekit.rb
-- test/test_helper.rb
 - test/test_phidgets.rb
+- test/test_helper.rb
+- test/test_interfacekit.rb