phidgets 0.0.3 → 0.0.4

data/History.txt

@@ -1,3 +1,7 @@
+== 0.0.4 2010-09-10
+  * Updated for compatability with Ruby 1.9
+  * Removed all support for callbacks
+
 == 0.0.3 2010-08-09
   * Moved the Phidgets::Exception class before the initialization code so that the init code can throw an exception
   * Fixed bugs in Common::openRemote and Common::openRemoteIP that prevented them from being called

data/README.rdoc

@@ -12,8 +12,6 @@ This gem provides a ruby interface to the phidgets library.
 * This gem uses DL to call the c functions in the Phidgets shared library, so the library must be installed and working.
 * 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 callback functionality of the Phidgets library is working but should be used with caution. I have found that the callback
-  will cause a stack overflow exception if it is too big (not sure exactly what the limit is, but it isn't much).
 * 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
   what is the name of the phidgets library.
@@ -35,30 +33,6 @@ This gem provides a ruby interface to the phidgets library.
     puts "Phidgets Error (#{e.code}). #{e}"
   end
 
-=== <b>or to use a callback:</b>
-
-  require 'phidgets'
-
-  def onConnect(handle, data)
-    # the ruby object passed in to the callback is converted to an object id.
-    # Now convert it back to an object reference
-    ik = ObjectSpace._id2ref(data.to_i)
-    puts ik.getDeviceName
-    return 0
-  end
-
-  begin
-    ik = Phidgets::InterfaceKit.new
-    ik.setOnAttachHandler("onConnect", ik)
-    ik.open
-
-    # do something else
-    sleep 4
-
-  rescue Phidgets::Exception => e
-    puts "Phidgets Error (#{e.code}). #{e}"
-  end
-
 
 == REQUIREMENTS:
 

data/README.txt

@@ -12,8 +12,6 @@ This gem provides a ruby interface to the phidgets library.
 * This gem uses DL to call the c functions in the Phidgets shared library, so the library must be installed and working.
 * 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 callback functionality of the Phidgets library is working but should be used with caution. I have found that the callback
-  will cause a stack overflow exception if it is too big (not sure exactly what the limit is, but it isn't much).
 * 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
   what is the name of the phidgets library.
@@ -35,30 +33,6 @@ This gem provides a ruby interface to the phidgets library.
     puts "Phidgets Error (#{e.code}). #{e}"
   end
 
-=== <b>or to use a callback:</b>
-
-  require 'phidgets'
-
-  def onConnect(handle, data)
-    # the ruby object passed in to the callback is converted to an object id.
-    # Now convert it back to an object reference
-    ik = ObjectSpace._id2ref(data.to_i)
-    puts ik.getDeviceName
-    return 0
-  end
-
-  begin
-    ik = Phidgets::InterfaceKit.new
-    ik.setOnAttachHandler("onConnect", ik)
-    ik.open
-
-    # do something else
-    sleep 4
-
-  rescue Phidgets::Exception => e
-    puts "Phidgets Error (#{e.code}). #{e}"
-  end
-
 
 == REQUIREMENTS:
 

data/lib/phidgets.rb

@@ -7,5 +7,5 @@ require File.dirname(__FILE__) + '/phidgets/rfid.rb'
 require File.dirname(__FILE__) + '/phidgets/servo.rb'
 
 module Phidgets
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/phidgets/common.rb

@@ -5,7 +5,26 @@ require 'rbconfig'
 
 
 module Phidgets
-  extend DL::Importable
+
+  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
@@ -141,7 +160,7 @@ module Phidgets
         when EPHIDGET_CLOSED
           super('Phidget handle was closed.')
         when EPHIDGET_BADVERSION
-          super('Webservice and Client protocol versions don’t match. Update to newest release.')
+          super("Webservice and Client protocol versions don't match. Update to newest release.")
       end
     end
 
@@ -151,7 +170,7 @@ module Phidgets
     case Config::CONFIG['target_os']
       when /linux/
         dlload 'libphidget21.so'
-      when /mswin/
+      when /mswin/, /mingw/
         dlload 'phidget21.dll'
       when /darwin/
         dlload '/Library/Frameworks/Phidget21.framework/Versions/Current/Phidget21'
@@ -167,11 +186,6 @@ module Phidgets
   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 *)"
@@ -192,8 +206,8 @@ module Phidgets
 
   # 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)
+    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
@@ -201,8 +215,8 @@ module Phidgets
 
   # 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)
+    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
@@ -215,13 +229,13 @@ module Phidgets
   # * _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 = cPhidget_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 = cPhidget_disableLogging
+    r = self.send(FUNCTION_PREFIX + 'Phidget_disableLogging')
     raise Phidgets::Exception.new(r) if r != 0
   end
 
@@ -235,7 +249,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.cPhidget_openRemote(@handle, serial_number, server, password)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_openRemote', @handle, serial_number, server, password)
       raise Phidgets::Exception.new(r) if r != 0
       waitForAttachment(timeout) if timeout > 0
     end
@@ -248,7 +262,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.cPhidget_openRemoteIP(@handle, serial_number, address, port, password)
+      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
@@ -258,73 +272,28 @@ module Phidgets
     # * _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.cPhidget_open(@handle, serial_number)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_open', @handle, serial_number)
       raise Phidgets::Exception.new(r) if r != 0
       waitForAttachment(timeout) if timeout > 0
     end
 
     # Closes a Phidget.
     def close
-      r = Phidgets.cPhidget_close(@handle)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_close', @handle)
       raise Phidgets::Exception.new(r) if r != 0
     end
 
     # Frees a Phidget handle.
     def delete
       @handle.free = nil
-      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.
-    # === Parameters
-    # * _callback_func_ = Callback function.
-    # * _data_          = Data for use by the user - this object is passed back into the callback function.
-    def setOnDetachHandler(callback_func, data)
-      r = Phidgets.cPhidget_set_OnDetach_Handler(@handle, Phidgets.callback("int #{callback_func}(void *, void *)"), 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.
-    # === Parameters
-    # * _callback_func_ = Callback function.
-    # * _data_          = Data for use by the user - this object is passed back into the callback function.
-    def setOnAttachHandler(callback_func, data)
-      r = Phidgets.cPhidget_set_OnAttach_Handler(@handle, Phidgets.callback("int #{callback_func}(void *, void *)"), 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.
-    # === Parameters
-    # * _callback_func_ = Callback function.
-    # * _data_          = Data for use by the user - this object is passed back into the callback function.
-    def setOnConnectHandler(callback_func, data)
-      r = Phidgets.cPhidget_set_OnServerConnect_Handler(@handle, Phidgets.callback("int #{callback_func}(void *, void *)"), 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.
-    # === Parameters
-    # * _callback_func_ = Callback function.
-    # * _data_          = Data for use by the user - this object is passed back into the callback function.
-    def setOnDisconnectHandler(callback_func, data)
-      r = Phidgets.cPhidget_set_OnServerDisconnect_Handler(@handle, Phidgets.callback("int #{callback_func}(void *, void *)"), 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.
-    # === Parameters
-    # * _callback_func_ = Callback function.
-    # * _data_          = Data for use by the user - this object is passed back into the callback function.
-    def setOnErrorHandler(callback_func, data)
-      r = Phidgets.cPhidget_set_OnError_Handler(@handle, Phidgets.callback("int #{callback_func}(void *, void *, int, const char *)"), DL::PtrData.new(data.object_id))
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_delete', @handle)
       raise Phidgets::Exception.new(r) if r != 0
     end
 
     # Gets the specific name of a Phidget.
     def getDeviceName
-      ptr = DL.malloc(DL.sizeof('P'))
-      r = Phidgets.cPhidget_getDeviceName(@handle, ptr.ref)
+      ptr = Phidgets.malloc(SIZEOF_VOIDP)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_getDeviceName', @handle, ptr.ref)
       raise Phidgets::Exception.new(r) if r != 0
       ptr.free = nil
       ptr.to_s
@@ -332,8 +301,8 @@ module Phidgets
 
     # Gets the serial number of a Phidget.
     def getSerialNumber
-      sn = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidget_getSerialNumber(@handle, sn.ref)
+      sn = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_getSerialNumber', @handle, sn.ref)
       raise Phidgets::Exception.new(r) if r != 0
       sn.free = nil
       sn.to_i
@@ -341,8 +310,8 @@ module Phidgets
 
     # Gets the firmware version of a Phidget.
     def getDeviceVersion
-      ver = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidget_getDeviceVersion(@handle, ver.ref)
+      ver = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_getDeviceVersion', @handle, ver.ref)
       raise Phidgets::Exception.new(r) if r != 0
       ver.free = nil
       ver.to_i
@@ -350,8 +319,8 @@ module Phidgets
 
     # Gets the attached status of a Phidget.
     def getDeviceStatus
-      stat = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidget_getDeviceStatus(@handle, stat.ref)
+      stat = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_getDeviceStatus', @handle, stat.ref)
       raise Phidgets::Exception.new(r) if r != 0
       stat.free = nil
       stat.to_i
@@ -359,8 +328,8 @@ module Phidgets
 
     # Gets the type (class) of a Phidget.
     def getDeviceType
-      ptr = DL.malloc(DL.sizeof('P'))
-      r = Phidgets.cPhidget_getDeviceType(@handle, ptr.ref)
+      ptr = Phidgets.malloc(SIZEOF_VOIDP)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_getDeviceType', @handle, ptr.ref)
       raise Phidgets::Exception.new(r) if r != 0
       ptr.free = nil
       ptr.to_s
@@ -368,8 +337,8 @@ module Phidgets
 
     # Gets the label of a Phidget.
     def getDeviceLabel
-      ptr = DL.malloc(DL.sizeof('P'))
-      r = Phidgets.cPhidget_getDeviceLabel(@handle, ptr.ref)
+      ptr = Phidgets.malloc(SIZEOF_VOIDP)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_getDeviceLabel', @handle, ptr.ref)
       raise Phidgets::Exception.new(r) if r != 0
       ptr.free = nil
       ptr.to_s
@@ -379,7 +348,7 @@ module Phidgets
     # === Parameters
     # * _label_ = A string containing the label to be set.
     def setDeviceLabel(label)
-      r = Phidgets.cPhidget_setDeviceLabel(@handle, label)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_setDeviceLabel', @handle, label)
       raise Phidgets::Exception.new(r) if r != 0
     end
 
@@ -387,14 +356,14 @@ module Phidgets
     # === Parameters
     # * _timeout_ = Time to wait for the attachment. Specify 0 to wait forever.
     def waitForAttachment(timeout)
-      r = Phidgets.cPhidget_waitForAttachment(@handle, timeout)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_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
-      ptr = DL.malloc(DL.sizeof('P'))
-      r = Phidgets.cPhidget_getServerID(@handle, ptr.ref)
+      ptr = Phidgets.malloc(SIZEOF_VOIDP)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_getServerID', @handle, ptr.ref)
       raise Phidgets::Exception.new(r) if r != 0
       ptr.free = nil
       ptr.to_s
@@ -402,9 +371,9 @@ module Phidgets
 
     # Gets the address and port of a remotely opened Phidget. This will fail if the Phidget was opened locally.
     def getServerAddress
-      ptr = DL.malloc(DL.sizeof('P'))
-      port = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidget_getServerAddress(@handle, ptr.ref, port.ref)
+      ptr = Phidgets.malloc(SIZEOF_VOIDP)
+      port = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_getServerAddress', @handle, ptr.ref, port.ref)
       raise Phidgets::Exception.new(r) if r != 0
       ptr.free = nil
       port.free = nil
@@ -413,8 +382,8 @@ module Phidgets
 
     # Gets the connected to server status of a remotely opened Phidget. This will fail if the Phidget was opened locally.
     def getServerStatus
-      stat = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidget_getServerStatus(@handle, stat.ref)
+      stat = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_getServerStatus', @handle, stat.ref)
       raise Phidgets::Exception.new(r) if r != 0
       stat.free = nil
       stat.to_i
@@ -422,8 +391,8 @@ module Phidgets
 
     # Gets the device ID of a Phidget.
     def getDeviceID
-      dev = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidget_getDeviceID(@handle, dev.ref)
+      dev = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_getDeviceID', @handle, dev.ref)
       raise Phidgets::Exception.new(r) if r != 0
       dev.free = nil
       dev.to_i
@@ -431,8 +400,8 @@ module Phidgets
 
     # Gets the class of a Phidget.
     def getDeviceClass
-      dev = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidget_getDeviceClass(@handle, dev.ref)
+      dev = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'Phidget_getDeviceClass', @handle, dev.ref)
       raise Phidgets::Exception.new(r) if r != 0
       dev.free = nil
       dev.to_i
@@ -442,7 +411,7 @@ module Phidgets
     private
 
     def initialize
-      @handle = DL.malloc(DL.sizeof('P'))
+      @handle = Phidgets.malloc(SIZEOF_VOIDP)
     end
 
   end

data/lib/phidgets/interfacekit.rb

@@ -29,8 +29,8 @@ module Phidgets
 
     # Gets the number of digital inputs supported by this board.
     def getInputCount
-      cnt = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidgetInterfaceKit_getInputCount(@handle, cnt.ref)
+      cnt = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_getInputCount', @handle, cnt.ref)
       raise Phidgets::Exception.new(r) if r != 0
       cnt.free = nil
       cnt.to_i
@@ -40,8 +40,8 @@ module Phidgets
     # === Parameters
     # * _index_ = The input index.
     def getInputState(index)
-      state = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidgetInterfaceKit_getInputState(@handle, index, state.ref)
+      state = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_getInputState', @handle, index, state.ref)
       raise Phidgets::Exception.new(r) if r != 0
       state.free = nil
       state.to_i
@@ -49,8 +49,8 @@ module Phidgets
 
     # Gets the number of digital outputs supported by this board.
     def getOutputCount
-      cnt = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidgetInterfaceKit_getOutputCount(@handle, cnt.ref)
+      cnt = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_getOutputCount', @handle, cnt.ref)
       raise Phidgets::Exception.new(r) if r != 0
       cnt.free = nil
       cnt.to_i
@@ -60,8 +60,8 @@ module Phidgets
     # === Parameters
     # * _index_ = The output index.
     def getOutputState(index)
-      state = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidgetInterfaceKit_getOutputState(@handle, index, state.ref)
+      state = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_getOutputState', @handle, index, state.ref)
       raise Phidgets::Exception.new(r) if r != 0
       state.free = nil
       state.to_i
@@ -72,14 +72,14 @@ module Phidgets
     # * _index_ = The output index.
     # * _state_ = The output state. Possible values are PTRUE  and PFALSE.
     def setOutputState(index, state)
-      r = Phidgets.cPhidgetInterfaceKit_setOutputState(@handle, index, state)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_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
-      cnt = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidgetInterfaceKit_getSensorCount(@handle, cnt.ref)
+      cnt = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_getSensorCount', @handle, cnt.ref)
       raise Phidgets::Exception.new(r) if r != 0
       cnt.free = nil
       cnt.to_i
@@ -89,8 +89,8 @@ module Phidgets
     # === Parameters
     # * _index_ = The sensor index.
     def getSensorValue(index)
-      state = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidgetInterfaceKit_getSensorValue(@handle, index, state.ref)
+      state = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_getSensorValue', @handle, index, state.ref)
       raise Phidgets::Exception.new(r) if r != 0
       state.free = nil
       state.to_i
@@ -100,8 +100,8 @@ module Phidgets
     # === Parameters
     # * _index_ = The sensor index.
     def getSensorRawValue(index)
-      state = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidgetInterfaceKit_getSensorRawValue(@handle, index, state.ref)
+      state = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_getSensorRawValue', @handle, index, state.ref)
       raise Phidgets::Exception.new(r) if r != 0
       state.free = nil
       state.to_i
@@ -109,8 +109,8 @@ module Phidgets
 
     # Gets the ratiometric state for this board.
     def getRatiometric
-      ratio = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidgetInterfaceKit_getRatiometric(@handle, ratio.ref)
+      ratio = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_getRatiometric', @handle, ratio.ref)
       raise Phidgets::Exception.new(r) if r != 0
       ratio.free = nil
       ratio.to_i
@@ -120,7 +120,7 @@ module Phidgets
     # === Parameters
     # * _ratiometric_ = The ratiometric state. Possible values are PTRUE  and PFALSE.
     def setRatiometric(ratiometric)
-      r = Phidgets.cPhidgetInterfaceKit_setRatiometric(@handle, ratiometric)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_setRatiometric', @handle, ratiometric)
       raise Phidgets::Exception.new(r) if r != 0
     end
 
@@ -129,7 +129,7 @@ module Phidgets
     
     # Creates a Phidget InterfaceKit handle.
     def create
-      r = Phidgets.cPhidgetInterfaceKit_create(@handle.ref)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetInterfaceKit_create', @handle.ref)
       raise Phidgets::Exception.new(r) if r != 0
     end
 

data/lib/phidgets/rfid.rb

@@ -12,8 +12,6 @@ module Phidgets
   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
@@ -30,8 +28,8 @@ module Phidgets
 
     # Gets the number of outputs supported by this board.
     def getOutputCount
-      cnt = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidgetRFID_getOutputCount(@handle, cnt.ref)
+      cnt = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_getOutputCount', @handle, cnt.ref)
       raise Phidgets::Exception.new(r) if r != 0
       cnt.free = nil
       cnt.to_i
@@ -41,8 +39,8 @@ module Phidgets
     # === Parameters
     # * _index_ = The output index.
     def getOutputState(index)
-      state = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidgetRFID_getOutputState(@handle, index, state.ref)
+      state = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_getOutputState', @handle, index, state.ref)
       raise Phidgets::Exception.new(r) if r != 0
       state.free = nil
       state.to_i
@@ -53,14 +51,14 @@ module Phidgets
     # * _index_ = The output index.
     # * _state_ = The output state. Possible values are PTRUE  and PFALSE.
     def setOutputState(index, state)
-      r = Phidgets.cPhidgetRFID_setOutputState(@handle, index, state)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_setOutputState', @handle, index, state)
       raise Phidgets::Exception.new(r) if r != 0
     end
 
     # Gets the state of the antenna.
     def getAntennaOn
-      state = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidgetRFID_getAntennaOn(@handle, state.ref)
+      state = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_getAntennaOn', @handle, state.ref)
       raise Phidgets::Exception.new(r) if r != 0
       state.free = nil
       state.to_i
@@ -70,14 +68,14 @@ module Phidgets
     # === Parameters
     # * _state_ = The antenna state. Possible values are PTRUE  and PFALSE.
     def setAntennaOn(state)
-      r = Phidgets.cPhidgetRFID_setAntennaOn(@handle, state)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_setAntennaOn', @handle, state)
       raise Phidgets::Exception.new(r) if r != 0
     end
 
     # Gets the state of the onboard LED.
     def getLedOn
-      state = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidgetRFID_getLEDOn(@handle, state.ref)
+      state = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_getLEDOn', @handle, state.ref)
       raise Phidgets::Exception.new(r) if r != 0
       state.free = nil
       state.to_i
@@ -87,22 +85,22 @@ module Phidgets
     # === Parameters
     # * _state_ = The LED state. Possible values are PTRUE  and PFALSE.
     def setLedOn(state)
-      r = Phidgets.cPhidgetRFID_setLEDOn(@handle, state)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_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
-      tag = DL.malloc(5)
-      r = Phidgets.cPhidgetRFID_getLastTag(@handle, tag)
+      tag = Phidgets.malloc(5)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_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
-      stat = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidgetRFID_getTagStatus(@handle, stat.ref)
+      stat = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_getTagStatus', @handle, stat.ref)
       raise Phidgets::Exception.new(r) if r != 0
       stat.free = nil
       stat.to_i
@@ -113,7 +111,7 @@ module Phidgets
 
     # Creates a Phidget RFID handle.
     def create
-      r = Phidgets.cPhidgetRFID_create(@handle.ref)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetRFID_create', @handle.ref)
       raise Phidgets::Exception.new(r) if r != 0
     end
 

data/lib/phidgets/servo.rb

@@ -24,8 +24,8 @@ module Phidgets
 
     # Gets the number of motors supported by this controller.
     def getMotorCount
-      cnt = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidgetServo_getMotorCount(@handle, cnt.ref)
+      cnt = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_getMotorCount', @handle, cnt.ref)
       raise Phidgets::Exception.new(r) if r != 0
       cnt.free = nil
       cnt.to_i
@@ -35,8 +35,8 @@ module Phidgets
     # === Parameters
     # * _index_ = The motor index.
     def getPosition(index)
-      pos = DL.malloc(DL.sizeof('D'))
-      r = Phidgets.cPhidgetServo_getPosition(@handle, index, pos.ref)
+      pos = Phidgets.malloc(SIZEOF_DOUBLE)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_getPosition', @handle, index, 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.cPhidgetServo_setPosition(@handle, index, position)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_setPosition', @handle, index, position)
       raise Phidgets::Exception.new(r) if r != 0
     end
     
@@ -55,8 +55,8 @@ module Phidgets
     # === Parameters
     # * _index_ = The motor index.
     def getPositionMax(index)
-      pos = DL.malloc(DL.sizeof('D'))
-      r = Phidgets.cPhidgetServo_getPositionMax(@handle, index, pos.ref)
+      pos = Phidgets.malloc(SIZEOF_DOUBLE)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_getPositionMax', @handle, index, pos.ref)
       raise Phidgets::Exception.new(r) if r != 0
       pos.free = nil
       pos.to_f
@@ -66,8 +66,8 @@ module Phidgets
     # === Parameters
     # * _index_ = The motor index.
     def getPositionMin(index)
-      pos = DL.malloc(DL.sizeof('D'))
-      r = Phidgets.cPhidgetServo_getPositionMin(@handle, index, pos.ref)
+      pos = Phidgets.malloc(SIZEOF_DOUBLE)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_getPositionMin', @handle, index, pos.ref)
       raise Phidgets::Exception.new(r) if r != 0
       pos.free = nil
       pos.to_f
@@ -77,8 +77,8 @@ module Phidgets
     # === Parameters
     # * _index_ = The motor index.
     def getEngaged(index)
-      eng = DL.malloc(DL.sizeof('I'))
-      r = Phidgets.cPhidgetServo_getEngaged(@handle, index, eng.ref)
+      eng = Phidgets.malloc(SIZEOF_INT)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_getEngaged', @handle, index, 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.cPhidgetServo_setEngaged(@handle, index, state)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_setEngaged', @handle, index, state)
       raise Phidgets::Exception.new(r) if r != 0
     end
 
@@ -97,7 +97,7 @@ module Phidgets
 
     # Creates a Phidget Servo handle.
     def create
-      r = Phidgets.cPhidgetServo_create(@handle.ref)
+      r = Phidgets.send(FUNCTION_PREFIX + 'PhidgetServo_create', @handle.ref)
       raise Phidgets::Exception.new(r) if r != 0
     end
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: phidgets
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Craig DeHaan
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 -04:00
+date: 2010-09-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 4
         version: 2.0.4
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
-    version: 
+  type: :development
+  version_requirements: *id002
 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.
@@ -80,22 +93,24 @@ 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.5
+rubygems_version: 1.3.6
 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_phidgets.rb
-- test/test_helper.rb
 - test/test_interfacekit.rb
+- test/test_helper.rb
+- test/test_phidgets.rb