phidgets 0.0.1 → 0.0.2

data/History.txt

@@ -1,4 +1,6 @@
+== 0.0.2 2010-05-12
+  * Rewrote using DL/Importable
+  * Added some documentation
+  
 == 0.0.1 2009-03-27
-
-* 1 major enhancement:
   * Initial release

data/README.rdoc

@@ -14,8 +14,7 @@ This gem provides a ruby interface to the phidgets library.
 * Not all the devices have been implemented, and not all of the devices that have been implemented have been fully tested.
 * The callback functionality of the Phidgets library is not working very well. Making multiple calls to the phidgets library from
   within a callback will cause an exception.
-* The gem will attempt to guess the name of the phidgets library based on the platform it is run on (Linux or Windows). If it guesses
-  incorrectly, the library name can be set manually with Phidgets::setLibName(lib)
+* The gem will attempt to guess the name of the phidgets library based on the platform it is run on (Linux or Windows).
 
 == SYNOPSIS:
 
@@ -47,7 +46,7 @@ end
 
 == LICENSE:
 
-Copyright (C) 2009  Craig DeHaan
+Copyright (C) 2009-2010  Craig DeHaan
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

data/Rakefile

@@ -1,28 +1,20 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/phidgets'
+require 'rubygems'
+gem 'hoe', '>= 2.1.0'
+require 'hoe'
+require 'fileutils'
+require './lib/phidgets'
+
+Hoe.plugin :newgem
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('phidgets', Phidgets::VERSION) do |p|
-  p.developer('Craig DeHaan', 'craig.s.dehaan@gmail.com')
-  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
-  p.rubyforge_name       = p.name # TODO this is default value
-  # p.extra_deps         = [
-  #   ['activesupport','>= 2.0.2'],
-  # ]
-  p.extra_dev_deps = [
-    ['newgem', ">= #{::Newgem::VERSION}"]
-  ]
-  
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.rsync_args = '-av --delete --ignore-errors'
+$hoe = Hoe.spec 'phidgets' do
+  self.developer 'Craig DeHaan', 'craig.s.dehaan@gmail.com'
+  self.post_install_message = 'PostInstall.txt'
+  self.rubyforge_name       = self.name
+
 end
 
-require 'newgem/tasks' # load /tasks/*.rake
+require 'newgem/tasks'
 Dir['tasks/**/*.rake'].each { |t| load t }
 
-# TODO - want other tests/tasks run by default? Add them to the list
-# task :default => [:spec, :features]

data/lib/phidgets.rb

@@ -6,5 +6,5 @@ require File.dirname(__FILE__) + '/phidgets/interfacekit.rb'
 require File.dirname(__FILE__) + '/phidgets/rfid.rb'
 
 module Phidgets
-  VERSION = '0.0.1'
-end
+  VERSION = '0.0.2'
+end

data/lib/phidgets/common.rb

@@ -1,97 +1,156 @@
 
 require 'dl'
+require 'dl/import'
 require 'rbconfig'
 
-module Phidgets
 
-  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
+module Phidgets
+  extend DL::Importable
+
+  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 
-
-  def Phidgets.setLibName(name)
-    Common.setLibName(name)
+  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
+
+  begin
+    case Config::CONFIG['target_os']
+      when 'linux'
+        dlload 'libphidget21.so'
+      when 'mswin32'
+        dlload 'phidget21.dll'
+      else
+        raise Phidgets::Exception.new(Exception::EPHIDGET_LIBNAME)
+    end
+  rescue
+    raise Phidgets::Exception.new(Exception::EPHIDGET_LOAD_LIB_FAIL)
+  end
+
+  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_set_OnDetach_Handler(void *, void *, void *)"
+  extern "int CPhidget_set_OnAttach_Handler(void *, void *, void *)"
+  extern "int CPhidget_set_OnServerConnect_Handler(void *, void *, void *)"
+  extern "int CPhidget_set_OnServerDisconnect_Handler(void *, void *, void *)"
+  extern "int CPhidget_set_OnError_Handler(void *, void *, 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 *)"
+
+  # Gets the library version. This contains a version number and a build date.
+  def Phidgets.getLibraryVersion
+    ptr = DL.malloc(DL.sizeof('P'))
+    r = cPhidget_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 = DL.malloc(DL.sizeof('P'))
+    r = cPhidget_getErrorDescription(error_code, ptr.ref)
+    raise Phidgets::Exception.new(r) if r != 0
+    ptr.free = nil
+    ptr.to_s
+  end
+
+
   class Exception < RuntimeError
     attr_reader :code
 
-    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
+    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 -2
+        when EPHIDGET_LOAD_LIB_FAIL
           super('Failed to load Phidgets Library')
-        when -1
+        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.')
@@ -136,257 +195,204 @@ module Phidgets
 
   end
 
-  class Common
-    @@libname = nil
-    @@lib = nil
-    @@open_remote = nil
-    @@open_remote_ip = nil
-    @@open = nil
-    @@close = nil
-    @@delete = nil
-    @@detach_handler = nil
-    @@attach_handler = nil
-    @@connect_handler = nil
-    @@disconnect_handler = nil
-    @@error_handler = nil
-    @@name = nil
-    @@serial = nil
-    @@version = nil
-    @@status = nil
-    @@lib_version = nil
-    @@type = nil
-    @@get_label = nil
-    @@set_label = nil
-    @@error_description = nil
-    @@wait = nil
-    @@server_id = nil
-    @@server_addr = nil
-    @@server_status = nil
-    @@device_id = nil
-    @@device_class = nil
 
+  class Common
     def initialize
-      if @@libname == nil
-        case Config::CONFIG['target_os']
-          when 'linux'
-            @@libname = 'libphidget21.so'
-          when 'mswin32'
-            @@libname = 'phidget21.dll'
-          else
-            raise Phidgets::Exception.new(-1)
-        end
-      end
-
-      begin
-        @@lib = DL.dlopen(@@libname)
-      rescue
-        raise Phidgets::Exception.new(-2)
-      end
-
       @handle = DL.malloc(DL.sizeof('P'))
-      
-    end
-
-    private
-
-    def sym(name, interface)
-      @@lib[name, interface]
-    end
-
-    def call_IX(sym_name, func_name, format, arg1)
-      sym_name = sym(func_name, format) if sym_name == nil
-      r,rs = sym_name.call(arg1)
-      raise Phidgets::Exception.new(r) if r != 0
-    end
-
-    def call_IXX(sym_name, func_name, format, arg1, arg2)
-      sym_name = sym(func_name, format) if sym_name == nil
-      r,rs = sym_name.call(arg1, arg2)
-      raise Phidgets::Exception.new(r) if r != 0
-    end
-
-    def call_IXXX(sym_name, func_name, format, arg1, arg2, arg3)
-      sym_name = sym(func_name, format) if sym_name == nil
-      r,rs = sym_name.call(arg1, arg2, arg3)
-      raise Phidgets::Exception.new(r) if r != 0
-    end
-
-    def call_IXXXX(sym_name, func_name, format, arg1, arg2, arg3, arg4)
-      sym_name = sym(func_name, format) if sym_name == nil
-      r,rs = sym_name.call(arg1, arg2, arg3, arg4)
-      raise Phidgets::Exception.new(r) if r != 0
-    end
-
-    def call_IXXXXX(sym_name, func_name, format, arg1, arg2, arg3, arg4, arg5)
-      sym_name = sym(func_name, format) if sym_name == nil
-      r,rs = sym_name.call(arg1, arg2, arg3, arg4, arg5)
-      raise Phidgets::Exception.new(r) if r != 0
-    end
-
-    def call_IPi(sym_name, func_name, arg1)
-      sym_name = sym(func_name, 'IPi') if sym_name == nil
-      return_arg = 0
-      r,rs = sym_name.call(arg1, return_arg)
-      raise Phidgets::Exception.new(r) if r != 0
-      rs[1]
-    end
-
-    def call_IPIi(sym_name, func_name, arg1, arg2)
-      sym_name = sym(func_name, 'IPIi') if sym_name == nil
-      return_arg = 0
-      r,rs = sym_name.call(arg1, arg2, return_arg)
-      raise Phidgets::Exception.new(r) if r != 0
-      rs[2]
-    end
-
-    def call_IPs(sym_name, func_name, arg1)
-      sym_name = sym(func_name, 'IPp') if sym_name == nil
-      arg_ptr = DL.malloc(DL.sizeof('P'))
-      r,rs = sym_name.call(arg1, arg_ptr.ref)
-      raise Phidgets::Exception.new(r) if r != 0
-      arg_ptr.free = nil
-      arg_ptr.to_s
-    end
-
-    def createCallback(callback)
-      DL.callback('IPP') {|handle,data|
-        data = ObjectSpace._id2ref(data.to_i)
-        eval("#{callback}(data)")
-      }
-    end
-
-    def createErrorCallback(callback)
-      DL.callback('IPPIS') {|handle,data,error_code,error_string|
-        data = ObjectSpace._id2ref(data.to_i)
-        eval("#{callback}(data,error_code,error_string)")
-      }
-    end
-
-    public
-
-    def Common.setLibName(name)
-      @@libname = name
     end
 
+    # Opens a Phidget remotely by ServerID. Note that this requires Bonjour (mDNS) to be running on both the host and the server.
     def openRemote(serial_number=-1, server=nil, password=nil, timeout=0)
-      call_IXXXX(@@open_remote, 'CPhidget_openRemote', 'IPISS', @handle, serial_number, server, password)
+      r = cPhidget_openRemote(@handle, serial_number, server, password)
+      raise Phidgets::Exception.new(r) if r != 0
       waitForAttachment(timeout) if timeout > 0
     end
 
+    # Opens a Phidget remotely by address and port.
     def openRemoteIP(serial_number, address, port=5001, password=nil, timeout=0)
-      call_IXXXXX(@@open_remote_ip, 'CPhidget_openRemoteIP', 'IPISIS', @handle, serial_number, address, port, password)
+      r = cPhidget_openRemoteIP(@handle, serial_number, address, port, password)
+      raise Phidgets::Exception.new(r) if r != 0
       waitForAttachment(timeout) if timeout > 0
     end
 
+    # Opens a Phidget.
     def open(serial_number=-1, timeout=0)
-      call_IXX(@@open, 'CPhidget_open', 'IPI', @handle, serial_number)
+      r = Phidgets.cPhidget_open(@handle, serial_number)
+      raise Phidgets::Exception.new(r) if r != 0
       waitForAttachment(timeout) if timeout > 0
     end
 
+    # Closes a Phidget.
     def close
-      call_IX(@@close, 'CPhidget_close', 'IP', @handle)
+      r = Phidgets.cPhidget_close(@handle)
+      raise Phidgets::Exception.new(r) if r != 0
     end
 
+    # Frees a Phidget handle.
     def delete
       @handle.free = nil
-      call_IX(@@delete, 'CPhidget_delete', 'IP', @handle)
+      r = Phidgets.cPhidget_delete(@handle)
+      raise Phidgets::Exception.new(r) if r != 0
     end
 
+    # Sets a detach handler callback function. This is called when this Phidget is unplugged from the system.
     def setOnDetachHandler(callback, data)
-      call_IXXX(@@detach_handler, 'CPhidget_set_OnDetach_Handler', 'IPPP', @handle, createCallback(callback), DL::PtrData.new(data.object_id))
+      r = Phidgets.cPhidget_set_OnDetach_Handler(@handle, createCallback(callback), DL::PtrData.new(data.object_id))
+      raise Phidgets::Exception.new(r) if r != 0
     end
 
+    # Sets an attach handler callback function. This is called when this Phidget is plugged into the system, and is ready for use.
     def setOnAttachHandler(callback, data)
-      call_IXXX(@@attach_handler, 'CPhidget_set_OnAttach_Handler', 'IPPP', @handle, createCallback(callback), DL::PtrData.new(data.object_id))
+      r = Phidgets.cPhidget_set_OnAttach_Handler(@handle, createCallback(callback), DL::PtrData.new(data.object_id))
+      raise Phidgets::Exception.new(r) if r != 0
     end
 
+    # Sets a server connect handler callback function. This is used for opening Phidgets remotely, and is called when a connection to the sever has been made.
     def setOnConnectHandler(callback, data)
-      call_IXXX(@@connect_handler, 'CPhidget_set_OnServerConnect_Handler', 'IPPP', @handle, createCallback(callback), DL::PtrData.new(data.object_id))
+      r = Phidgets.cPhidget_set_OnServerConnect_Handler(@handle, createCallback(callback), DL::PtrData.new(data.object_id))
+      raise Phidgets::Exception.new(r) if r != 0
     end
 
+    # Sets a server disconnect handler callback function. This is used for opening Phidgets remotely, and is called when a connection to the server has been lost.
     def setOnDisconnectHandler(callback, data)
-      call_IXXX(@@disconnect_handler, 'CPhidget_set_OnServerDisconnect_Handler', 'IPPP', @handle, createCallback(callback), DL::PtrData.new(data.object_id))
+      r = Phidgets.cPhidget_set_OnServerDisconnect_Handler(@handle, createCallback(callback), DL::PtrData.new(data.object_id))
+      raise Phidgets::Exception.new(r) if r != 0
     end
 
+    # Sets the error handler callback function. This is called when an asynchronous error occurs.
     def setOnErrorHandler(callback, data)
-      call_IXXX(@@error_handler, 'CPhidget_set_OnError_Handler', 'IPPP', @handle, createErrorCallback(callback), DL::PtrData.new(data.object_id))
+      r = Phidgets.cPhidget_set_OnError_Handler(@handle, createErrorCallback(callback), DL::PtrData.new(data.object_id))
+      raise Phidgets::Exception.new(r) if r != 0
     end
 
+    # Gets the specific name of a Phidget.
     def getDeviceName
-      call_IPs(@@name, 'CPhidget_getDeviceName', @handle)
+      ptr = DL.malloc(DL.sizeof('P'))
+      r = Phidgets.cPhidget_getDeviceName(@handle, ptr.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      ptr.free = nil
+      ptr.to_s
     end
 
+    # Gets the serial number of a Phidget.
     def getSerialNumber
-      call_IPi(@@serial, 'CPhidget_getSerialNumber', @handle)
+      sn = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidget_getSerialNumber(@handle, sn.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      sn.free = nil
+      sn.to_i
     end
 
+    # Gets the firmware version of a Phidget.
     def getDeviceVersion
-      call_IPi(@@version, 'CPhidget_getDeviceVersion', @handle)
+      ver = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidget_getDeviceVersion(@handle, ver.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      ver.free = nil
+      ver.to_i
     end
 
+    # Gets the attached status of a Phidget.
     def getDeviceStatus
-      call_IPi(@@status, 'CPhidget_getDeviceStatus', @handle)
-    end
-
-    def getLibraryVersion
-      @@lib_version = sym('CPhidget_getLibraryVersion', 'Ip') if @@lib_version == nil
-      lib_version_ptr = DL.malloc(DL.sizeof('P'))
-      r,rs = @@lib_version.call(lib_version_ptr.ref)
+      stat = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidget_getDeviceStatus(@handle, stat.ref)
       raise Phidgets::Exception.new(r) if r != 0
-      lib_version_ptr.free = nil
-      lib_version_ptr.to_s
+      stat.free = nil
+      stat.to_i
     end
 
+    # Gets the type (class) of a Phidget.
     def getDeviceType
-      call_IPs(@@type, 'CPhidget_getDeviceType', @handle)
+      ptr = DL.malloc(DL.sizeof('P'))
+      r = Phidgets.cPhidget_getDeviceType(@handle, ptr.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      ptr.free = nil
+      ptr.to_s
     end
 
+    # Gets the label of a Phidget.
     def getDeviceLabel
-      call_IPs(@@get_label, 'CPhidget_getDeviceLabel', @handle)
+      ptr = DL.malloc(DL.sizeof('P'))
+      r = Phidgets.cPhidget_getDeviceLabel(@handle, ptr.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      ptr.free = nil
+      ptr.to_s
     end
 
+    # Sets the label of a Phidget. Note that this is nut supported on very old Phidgets, and not yet supported in Windows.
     def setDeviceLabel(label)
-      call_IXX(@@set_label, 'CPhidget_setDeviceLabel', 'IPS', @handle, label)
-    end
-
-    def getErrorDescription(error_code)
-      @@error_description = sym('CPhidget_getErrorDescription', 'IIp') if @@error_description == nil
-      error_description_ptr = DL.malloc(DL.sizeof('P'))
-      r,rs = @@error_description.call(error_code, error_description_ptr.ref)
+      r = Phidgets.cPhidget_setDeviceLabel(@handle, label)
       raise Phidgets::Exception.new(r) if r != 0
-      error_description_ptr.free = nil
-      error_description_ptr.to_s
     end
 
+    # Waits for attachment to happen. This can be called wirght after calling CPhidget_open, as an alternative to using the attach handler.
     def waitForAttachment(timeout)
-      call_IXX(@@wait, 'CPhidget_waitForAttachment', 'IPI', @handle, timeout)
+      r = Phidgets.cPhidget_waitForAttachment(@handle, timeout)
+      raise Phidgets::Exception.new(r) if r != 0
     end
 
+    # Gets the server ID of a remotely opened Phidget. This will fail if the Phidget was opened locally.
     def getServerID
-      call_IPs(@@server_id, 'CPhidget_getServerID', @handle)
+      ptr = DL.malloc(DL.sizeof('P'))
+      r = Phidgets.cPhidget_getServerID(@handle, ptr.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      ptr.free = nil
+      ptr.to_s
     end
 
+    # Gets the address and port of a remotely opened Phidget. This will fail if the Phidget was opened locally.
     def getServerAddress
-      @@server_addr = sym('CPhidget_getServerAddress', 'IPpi') if @@server_addr == nil
-      server_addr_ptr = DL.malloc(DL.sizeof('P'))
-      server_port = 0
-      r,rs = @@server_addr.call(@handle, server_addr_ptr.ref, server_port)
+      ptr = DL.malloc(DL.sizeof('P'))
+      port = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidget_getServerAddress(@handle, ptr.ref, port.ref)
       raise Phidgets::Exception.new(r) if r != 0
-      server_addr_ptr.free = nil
-      a = [server_addr_ptr.to_s, rs[2]]
-      a
+      ptr.free = nil
+      port.free = nil
+      [ptr.to_s, port.to_i]
     end
 
+    # Gets the connected to server status of a remotely opened Phidget. This will fail if the Phidget was opened locally.
     def getServerStatus
-      call_IPi(@@server_status, 'CPhidget_getServerStatus', @handle)
+      stat = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidget_getServerStatus(@handle, stat.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      stat.free = nil
+      stat.to_i
     end
 
+    # Gets the device ID of a Phidget.
     def getDeviceID
-      call_IPi(@@device_id, 'CPhidget_getDeviceID', @handle)
+      dev = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidget_getDeviceID(@handle, dev.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      dev.free = nil
+      dev.to_i
     end
 
+    # Gets the class of a Phidget.
     def getDeviceClass
-      call_IPi(@@device_class, 'CPhidget_getDeviceClass', @handle)
+      dev = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidget_getDeviceClass(@handle, dev.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      dev.free = nil
+      dev.to_i
+    end
+
+
+    private
+
+    def createCallback(callback)
+      DL.callback('IPP') {|handle,data|
+        data = ObjectSpace._id2ref(data.to_i)
+        eval("#{callback}(data)")
+      }
+    end
+
+    def createErrorCallback(callback)
+      DL.callback('IPPIS') {|handle,data,error_code,error_string|
+        data = ObjectSpace._id2ref(data.to_i)
+        eval("#{callback}(data,error_code,error_string)")
+      }
     end
 
   end

data/lib/phidgets/interfacekit.rb

@@ -1,20 +1,21 @@
 
-#require 'phidgets/common'
 
 module Phidgets
 
+  extern "int CPhidgetInterfaceKit_create(void *)"
+  extern "int CPhidgetInterfaceKit_getInputCount(void *, int *)"
+  extern "int CPhidgetInterfaceKit_getInputState(void *, int, int *)"
+  extern "int CPhidgetInterfaceKit_getOutputCount(void *, int *)"
+  extern "int CPhidgetInterfaceKit_getOutputState(void *, int, int *)"
+  extern "int CPhidgetInterfaceKit_setOutputState(void *, int, int)"
+  extern "int CPhidgetInterfaceKit_getSensorCount(void *, int *)"
+  extern "int CPhidgetInterfaceKit_getSensorValue(void *, int, int *)"
+  extern "int CPhidgetInterfaceKit_getSensorRawValue(void *, int, int *)"
+  extern "int CPhidgetInterfaceKit_getRatiometric(void *, int *)"
+  extern "int CPhidgetInterfaceKit_setRatiometric(void *, int)"
+  
+  
   class InterfaceKit < Common
-    @@create = nil
-    @@input_count = nil
-    @@input_state = nil
-    @@output_count = nil
-    @@get_output_state = nil
-    @@set_output_state = nil
-    @@sensor_count = nil
-    @@sensor_value = nil
-    @@sensor_raw_value = nil
-    @@get_ratiometric = nil
-    @@set_ratiometric = nil
 
     def initialize(serial_number=-1, timeout=0)
       super()
@@ -22,54 +23,97 @@ module Phidgets
       open(serial_number, timeout) if timeout > 0
     end
 
-    private
-
-    def create
-      @@create = sym('CPhidgetInterfaceKit_create', 'Ip') if @@create == nil
-      r,rs = @@create.call(@handle.ref)
-      raise Phidgets::Exception.new(r) if r != 0
-    end
-
-    public
-
+    # Gets the number of digital inputs supported by this board.
     def getInputCount
-      call_IPi(@@input_count, 'CPhidgetInterfaceKit_getInputCount', @handle)
+      cnt = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidgetInterfaceKit_getInputCount(@handle, cnt.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      cnt.free = nil
+      cnt.to_i
     end
 
+    # Gets the state of a digital input.
     def getInputState(index)
-      call_IPIi(@@input_state, 'CPhidgetInterfaceKit_getInputState', @handle, index)
+      state = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidgetInterfaceKit_getInputState(@handle, index, state.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      state.free = nil
+      state.to_i
     end
 
+    # Gets the number of digital outputs supported by this board.
     def getOutputCount
-      call_IPi(@@output_count, 'CPhidgetInterfaceKit_getOutputCount', @handle)
+      cnt = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidgetInterfaceKit_getOutputCount(@handle, cnt.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      cnt.free = nil
+      cnt.to_i
     end
 
+    # Gets the state of a digital output.
     def getOutputState(index)
-      call_IPIi(@@get_output_state, 'CPhidgetInterfaceKit_getOutputState', @handle, index)
+      state = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidgetInterfaceKit_getOutputState(@handle, index, state.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      state.free = nil
+      state.to_i
     end
 
+    # Sets the state of a digital output.
     def setOutputState(index, state)
-      call_IXXX(@@set_output_state, 'CPhidgetInterfaceKit_setOutputState', 'IPII', @handle, index, state)
+      r = Phidgets.cPhidgetInterfaceKit_setOutputState(@handle, index, state)
+      raise Phidgets::Exception.new(r) if r != 0
     end
 
+    # Gets the number of sensor (analog) inputs supported by this board.
     def getSensorCount
-      call_IPi(@@sensor_count, 'CPhidgetInterfaceKit_getSensorCount', @handle)
+      cnt = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidgetInterfaceKit_getSensorCount(@handle, cnt.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      cnt.free = nil
+      cnt.to_i
     end
 
+    # Gets a sensor value (0-1000).
     def getSensorValue(index)
-      call_IPIi(@@sensor_value, 'CPhidgetInterfaceKit_getSensorValue', @handle, index)
+      state = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidgetInterfaceKit_getSensorValue(@handle, index, state.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      state.free = nil
+      state.to_i
     end
 
+    # Gets a sensor raw value (12-bit).
     def getSensorRawValue(index)
-      call_IPIi(@@sensor_raw_value, 'CPhidgetInterfaceKit_getSensorRawValue', @handle, index)
+      state = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidgetInterfaceKit_getSensorRawValue(@handle, index, state.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      state.free = nil
+      state.to_i
     end
 
+    # Gets the ratiometric state for this board.
     def getRatiometric
-      call_IPi(@@get_ratiometric, 'CPhidgetInterfaceKit_getRatiometric', @handle)
+      ratio = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidgetInterfaceKit_getRatiometric(@handle, ratio.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      ratio.free = nil
+      ratio.to_i
     end
 
+    # Sets the ratiometric state for this board.
     def setRatiometric(ratiometric)
-      call_IXX(@@set_ratiometric, 'CPhidgetInterfaceKit_setRatiometric', 'IPI', @handle, ratiometric)
+      r = Phidgets.cPhidgetInterfaceKit_setRatiometric(@handle, ratiometric)
+      raise Phidgets::Exception.new(r) if r != 0
+    end
+
+
+    private
+    
+    # Creates a Phidget InterfaceKit handle.
+    def create
+      r = Phidgets.cPhidgetInterfaceKit_create(@handle.ref)
+      raise Phidgets::Exception.new(r) if r != 0
     end
 
   end

data/lib/phidgets/rfid.rb

@@ -1,21 +1,22 @@
 
-#require 'phidgets/common'
 
 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_getLEDOn(void *, int *)"
+  extern "int CPhidgetRFID_setLEDOn(void *, int, int *)"
+  extern "int CPhidgetRFID_getLastTag(void *, int, int *)"
+  extern "int CPhidgetRFID_getTagStatus(void *, int *)"
+  extern "int CPhidgetRFID_set_OnTag_Handler(void *, int)"
+  extern "int CPhidgetRFID_set_OnTagLost_Handler(void *, int)"
+  
+  
   class RFID < Common
-    @@create = nil
-    @@output_count = nil
-    @@get_output_state = nil
-    @@set_output_state = nil
-    @@get_antenna_on = nil
-    @@set_antenna_on = nil
-    @@get_led_on = nil
-    @@set_led_on = nil
-    @@get_last_tag = nil
-    @@get_tag_status = nil
-    @@on_tag_handler = nil
-    @@tag_lost_handler = nil
 
     def initialize(serial_number=-1, timeout=0)
       super()
@@ -23,58 +24,84 @@ module Phidgets
       open(serial_number, timeout) if timeout > 0
     end
 
-    private
-
-    def create
-      @@create = sym('CPhidgetRFID_create', 'Ip') if @@create == nil
-      r,rs = @@create.call(@handle.ref)
-      raise Phidgets::Exception.new(r) if r != 0
-    end
-
-    public
-
+    # Gets the number of outputs supported by this board.
     def getOutputCount
-      call_IPi(@@output_count, 'CPhidgetRFID_getOutputCount', @handle)
+      cnt = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidgetRFID_getOutputCount(@handle, cnt.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      cnt.free = nil
+      cnt.to_i
     end
 
+    # Gets the state of an output.
     def getOutputState(index)
-      call_IPIi(@@get_output_state, 'CPhidgetRFID_getOutputState', @handle, index)
+      state = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidgetRFID_getOutputState(@handle, index, state.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      state.free = nil
+      state.to_i
     end
 
+    # Sets the state of an output.
     def setOutputState(index, state)
-      call_IXXX(@@set_output_state, 'CPhidgetRFID_setOutputState', 'IPII', @handle, index, state)
+      r = Phidgets.cPhidgetRFID_setOutputState(@handle, index, state)
+      raise Phidgets::Exception.new(r) if r != 0
     end
 
+    # Gets the state of the antenna.
     def getAntennaOn
-      call_IPi(@@get_antenna_on, 'CPhidgetRFID_getAntennaOn', @handle)
+      state = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidgetRFID_getAntennaOn(@handle, state.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      state.free = nil
+      state.to_i
     end
 
+    # Sets the state of the antenna. Note that the antenna must be enabled before tags will be read.
     def setAntennaOn(state)
-      call_IPX(@@set_antenna_on, 'CPhidgetRFID_setAntennaOn', 'IPI', @handle, state)
+      r = Phidgets.cPhidgetRFID_setAntennaOn(@handle, state)
+      raise Phidgets::Exception.new(r) if r != 0
     end
 
+    # Gets the state of the onboard LED.
     def getLedOn
-      call_IPi(@@get_led_on, 'CPhidgetRFID_getLEDOn', @handle)
+      state = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidgetRFID_getLEDOn(@handle, state.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      state.free = nil
+      state.to_i
     end
 
+    # Sets the state of the onboard LED.
     def setLedOn(state)
-      call_IPX(@@set_led_on, 'CPhidgetRFID_setLEDOn', 'IPI', @handle, state)
+      r = Phidgets.cPhidgetRFID_setLEDOn(@handle, state)
+      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
-      call_IPs(@@get_last_tag, 'CPhidgetRFID_getLastTag', @handle)
+      tag = DL.malloc(5)
+      r = Phidgets.cPhidgetRFID_getLastTag(@handle, tag)
+      raise Phidgets::Exception.new(r) if r != 0
+      tag
     end
 
+    # Gets the tag present status. This is whether or not a tag is being read by the reader.
     def getTagStatus
-      call_IPi(@@get_tag_status, 'CPhidgetRFID_getTagStatus', @handle)
+      stat = DL.malloc(DL.sizeof('I'))
+      r = Phidgets.cPhidgetRFID_getTagStatus(@handle, stat.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      stat.free = nil
+      stat.to_i
     end
 
-    def setOnTagHandler(callback, data)
-      call_IXXX(@@on_tag_handler, 'CPhidgetRFID_set_OnTag_Handler', 'IPPP', @handle, createCallback(callback), DL::PtrData.new(data.object_id))
-    end
 
-    def setOnTagLostHandler(callback, data)
-      call_IXXX(@@tag_lost_handler, 'CPhidgetRFID_set_OnTagLost_Handler', 'IPPP', @handle, createCallback(callback), DL::PtrData.new(data.object_id))
+    private
+
+    # Creates a Phidget RFID handle.
+    def create
+      r = Phidgets.cPhidgetRFID_create(@handle.ref)
+      raise Phidgets::Exception.new(r) if r != 0
     end
 
   end

data/test/test_interfacekit.rb

@@ -3,7 +3,6 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 class TestPhidgetsInterfaceKit < Test::Unit::TestCase
 
   def setup
-    sleep 1
   end
   
   def test_001_create
@@ -22,10 +21,10 @@ class TestPhidgetsInterfaceKit < Test::Unit::TestCase
   end
   
   def test_003_fail_attach
-    assert_raises (Phidgets::Exception) {
+    assert_raise Phidgets::Exception do
       ik = Phidgets::InterfaceKit.new(1, 2000)
       ik.delete
-    }
+    end
   end
   
   def test_004_get_device_name

data/test/test_phidgets.rb

@@ -1,2 +1,15 @@
-
-require File.dirname(__FILE__) + '/test_interfacekit.rb'
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestPhidgets < Test::Unit::TestCase
+
+  def setup
+  end
+  
+  def test_library_version
+    lib_ver = ""
+    assert_nothing_raised {
+      lib_ver = Phidgets.getLibraryVersion
+    }
+    assert lib_ver.split[0] == "Phidget21"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: phidgets
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Craig DeHaan
@@ -9,18 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-23 00:00:00 -04:00
+date: 2010-06-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: newgem
+  name: rubyforge
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 2.0.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -30,9 +30,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 2.6.0
     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.
+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: []
@@ -44,7 +46,6 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - PostInstall.txt
-- README.rdoc
 files: 
 - GNU_GPL.txt
 - History.txt
@@ -64,6 +65,8 @@ files:
 - test/test_interfacekit.rb
 has_rdoc: true
 homepage: http://phidgets.rubyforge.org
+licenses: []
+
 post_install_message: PostInstall.txt
 rdoc_options: 
 - --main
@@ -85,11 +88,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: phidgets
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+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_phidgets.rb
 - test/test_helper.rb
+- test/test_interfacekit.rb