phidgets 0.1.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3fd7bef7f559dc77c93de80a317dd43f97da07f
-  data.tar.gz: 8a41b2c09ac0b90067b7f76d20aab7b2afb5bb1c
+  metadata.gz: 269e80f514a11868b488560279ac48490f96d6c0
+  data.tar.gz: 3d7f3f44df420ef0354e074db95d6641f9c86270
 SHA512:
-  metadata.gz: 4b4500f256c1e668defc86a8f26c4eabb06758516f6bd3041b490ae5d1e6d13b64d7f6d75bde00f4139a0e5786eb1129171e1fa98cb67409d2669cade1dfaf49
-  data.tar.gz: 3233b9dcb43665bdb02e0d8323c226de86965dd7a11484e19fa5c9e09162ccbb6bf187afe235025083e0d830d21af91322565d401914adc695d5c8cc0631998f
+  metadata.gz: 35b317744b09f8602b5250715721812bd9087a985ec88ea01f64af2ba2b7640e89611a5b07d07b39b56c8f660f9c9b3c9d7162934558c5f8b1d204e44c51b92c
+  data.tar.gz: 7495847c8447027b0cabf86f0970d861d997cf706a1888e0cf7d1a94dd1f13788e70448259ea78f786e6d660977de0bfe3fa99acd9f58884ddfc5e34ef954034

data/History.txt

@@ -1,3 +1,6 @@
+== 1.0.0 2019-xx-xx
+  * Update to phidgets library 2.2
+
 == 0.1.3 2015-11-10
   * Fix undefined symbol error in ruby version 2.2
 

data/README.rdoc

@@ -9,27 +9,26 @@ This gem provides a ruby interface to the phidgets library.
 
 == FEATURES/PROBLEMS:
 
+* Version 1.0 of this gem if for Phidget Lib 2.2. For the older Phidget Lib 2.1, use version 0.1.3 of the gem.
 * This gem compiles a c extension for the phidget library, so the library must be installed and the development files must be located
   in a place that the compiler can find them. For windows the DevKit is required.
 * The gem has been tested to work on both Linux and Windows.
-* Tested with Phidget Library version 2.1.8.20130618
-* Callbacks do not work on Ruby versions earlier than 1.9. This is because native threads are required for them to work.
-* Method names follow the naming convention of the C library (getOutputState, setOutputState, etc). In addition, more "rubyish" aliases are provided (output_state, set_output_state, etc)
+* Tested with Phidget Library 2.2 Version 1.0.0
+* Method names follow the naming convention of the C library (getState, setState, etc). In addition, more "rubyish" aliases are provided (state, state=, etc)
 
 == SYNOPSIS:
 
   require 'phidgets'
 
   begin
-    ik = Phidgets::InterfaceKit.new
-    ik.open -1
-    ik.wait_for_attachment
+    di = Phidgets::DigitalInput.new
+    di.open_wait_for_attachment 500
 
-    puts "Device Name     = #{ik.device_name}"
-    puts "Serial Number   = #{ik.serial_number}"
-    puts "Device Version  = #{ik.device_version}"
+    puts "Device Name     = #{di.device_name}"
+    puts "Serial Number   = #{di.device_serial_number}"
+    puts "Device Version  = #{di.device_version}"
 
-    ik.close
+    di.close
 
   rescue Phidgets::Error => e
     puts e
@@ -38,45 +37,35 @@ This gem provides a ruby interface to the phidgets library.
 
   # Or using callbacks:
 
-  ik = Phidgets::InterfaceKit.new
-  ik.on_attach { |phid|
+  di = Phidgets::DigitalInput.new
+  di.on_attach { |phid|
     puts "Device Name     = #{phid.device_name}"
-    puts "Serial Number   = #{phid.serial_number}"
+    puts "Serial Number   = #{phid.device_serial_number}"
     puts "Device Version  = #{phid.device_version}"
   }
 
-  ik.open -1
-  sleep 5
-  ik.close
+  di.open
+  sleep 3
+  di.close
 
 
-  # The gem also installs a command line program that will list all phidget 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:
+  # The gem also installs a command line program that will list all phidget devices
+  # that are attached. For example:
 
-    => phidget list
-       ----------------------------------------------------------------------
-       | SerialNumber          | Device Name                                |
-       ----------------------------------------------------------------------
-       | 73723                 | Phidget InterfaceKit 0/0/8                 |
-       | 88103                 | Phidget InterfaceKit 0/0/4                 |
-       ----------------------------------------------------------------------
+    => phidget
+    ----------------------------------------------------------------------------
+    | SerialNumber    | Class                                | Hub    | Index  |
+    ----------------------------------------------------------------------------
+    | 269819          | Voltage Input                        | 0      | 0      |
+    | 269819          | Voltage Input                        | 0      | 1      |
+    | 269819          | Voltage Ratio Input                  | 0      | 0      |
+    | 269819          | Voltage Ratio Input                  | 0      | 1      |
+    | 269819          | Digital Input                        | 0      | 0      |
+    | 269819          | Digital Input                        | 0      | 1      |
+    | 269819          | Digital Output                       | 0      | 0      |
+    | 269819          | Digital Output                       | 0      | 1      |
+    ----------------------------------------------------------------------------
 
-  # 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 set_output_state 0 true
-    
-  # To call a method for a specific remote phidget:
-    => phidget 192.168.100.67:73782 set_output_state 2 false
 
 
 == REQUIREMENTS:
@@ -85,8 +74,8 @@ This gem provides a ruby interface to the phidgets library.
 * For Windows the ruby DevKit is required
 * The development header file and library must be placed in a location where the compiler can find them.
   For Linux this should be done when running "make install" for the Phidget Library. For Windows the files
-  need to be copied from the install directory (\\Program Files\\Phidgets). phidget21.h can be copied to
-  RUBY_DIR\\include\\ruby-1.9.1. phidget21.lib can be copied to RUBY_DIR\\lib.
+  need to be copied from the install directory (\\Program Files\\Phidgets). phidget22.h can be copied to
+  RUBY_DIR\\include\\ruby-x.x.x. phidget22.lib can be copied to RUBY_DIR\\lib.
 
 == INSTALL:
 

data/Rakefile

@@ -3,6 +3,7 @@
 require 'rubygems'
 require 'rake/extensiontask'
 require 'rake/packagetask'
+require 'rake/testtask'
 require 'rdoc/task'
 
 spec = Gem::Specification.load('phidgets.gemspec')
@@ -10,8 +11,10 @@ spec = Gem::Specification.load('phidgets.gemspec')
 Rake::ExtensionTask.new 'phidgets', spec
 
 Gem::PackageTask.new(spec) do |pkg|
-  
+end
 
+Rake::TestTask.new do |task|
+  task.pattern = 'test/test_*.rb'
 end
 
 RDOC_FILES = FileList["README.rdoc", "ext/phidgets/*.c", "lib/phidgets/*.rb"]
@@ -28,4 +31,3 @@ Rake::RDocTask.new(:ri) do |rd|
   rd.options << "--ri-system"
   rd.rdoc_files.include(RDOC_FILES)
 end
-

data/bin/phidget

@@ -1,84 +1,30 @@
 #!/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 set_output_state 0 true'
-  $stdout.puts '    phidget 34619 device_name'
-end
-
 begin
-  args = {:port => 5001, :password => ''}
-
-  case ARGV[0]
-  when /^(-1|\d+)$/
-    args[:serial_number] = $1.to_i
-  when /^(\w|.+):(-1|\d+)$/
-    args[:address] = $1
-    args[:serial_number] = $2.to_i
-  when /^list$/i
-    args[:list] = true
-  when /^(\w|.+)$/
-    if ARGV[1].downcase == 'list'
-      args[:list] = true
-      args[:address] = $1
-    else
-      raise "Invalid Arguments."
-    end
-  else
-    raise "Invalid Arguments."
-  end
-
   manager = Phidgets::Manager.new
-  manager.open(args)
-
-  # give the manager some time to find the devices
-  args[:address] ? sleep(2) : sleep(1)
-
-  devices = manager.attached_devices
-  manager.close
-
-  if devices.size == 0
-    $stdout.puts "\nThere are no phidgets attached.\n\n"
-    exit
+  manager.on_attach do |phid, serial, hub_port, index, ch_name|
+    str = "| #{serial}"
+    str += ' ' * (18 - str.length)
+    str += "| #{ch_name}"
+    str += ' ' * (57 - str.length)
+    str += "| #{hub_port}"
+    str += ' ' * (66 - str.length)
+    str += "| #{index}"
+    str += ' ' * (75 - str.length) + '|'
+    $stdout.puts str
   end
-
-  if args[:list]
-    $stdout.puts "\n----------------------------------------------------------------------"
-    $stdout.puts "| SerialNumber          | Device Name                                |"
-    $stdout.puts "----------------------------------------------------------------------"
-    devices.each_pair { |serial,phidget|
-      args[:serial_number] = serial
-      phidget.open(args)
-      phidget.wait_for_attachment(2000)
-      d_str = "| #{serial}"
-      d_str += " " * (24 - d_str.length) + "| #{phidget.device_name}"
-      d_str += " " * (69 - d_str.length) + "|"
-      $stdout.puts d_str
-      phidget.close
-    }
-    $stdout.puts "----------------------------------------------------------------------\n"
+  $stdout.puts "\n----------------------------------------------------------------------------"
+  $stdout.puts "| SerialNumber    | Class                                | Hub    | Index  |"
+  $stdout.puts "----------------------------------------------------------------------------"
+  manager.open
+  sleep 0.5
+  $stdout.puts "----------------------------------------------------------------------------\n"
+  manager.close
   
-  else
-    phidget = args[:serial_number] > 0 ? devices[args[:serial_number]] : devices.values[0]
-    args[:serial_number] = devices.keys[0] unless args[:serial_number] > 0
-    phidget.open(args)
-    phidget.wait_for_attachment(2000)
-    $stdout.puts eval("phidget.#{ARGV[1]}(#{ARGV[2..-1].join(',')})")
-    phidget.close
-  end
-
 rescue SystemExit
 rescue Exception => e
-  $stdout.puts "#{e}\n#{e.backtrace.join("\n")}\n#{usage}\n"
+  $stdout.puts "#{e}\n#{e.backtrace.join("\n")}\n"
 end
 

data/ext/phidgets/extconf.rb

@@ -1,18 +1,15 @@
 require 'mkmf'
 
-HEADER_DIRS = [ '/Library/Frameworks/Phidget21.framework/Headers' ]
+HEADER_DIRS = [ '/Library/Frameworks/Phidget22.framework/Headers' ]
 
-find_header 'phidget21.h', *HEADER_DIRS
-find_library 'libphidget21', 'CPhidget_getLibraryVersion', '/usr/lib/'
-have_framework('Phidget21') unless RUBY_VERSION < '1.9.0' 
-have_library('phidget21') 
+find_header 'phidget22.h', *HEADER_DIRS
+find_library 'phidget22', 'Phidget_getLibraryVersion', '/usr/lib/'
+have_framework('Phidget22')
+have_library('phidget22')
 dir_config("phidgets")
 
 have_header('ruby/thread.h')
-have_func('rb_thread_blocking_region')
 have_func('rb_thread_call_without_gvl')
 
-$CFLAGS += ' -DPH_CALLBACK' unless RUBY_VERSION < '1.9.0'
-
 create_makefile("phidgets")
 

data/ext/phidgets/phidgets.c

@@ -5,122 +5,326 @@
 #include <ruby/thread.h>
 #endif
 
-VALUE ph_errors[PHIDGET_ERROR_CODE_COUNT+1];
 
-VALUE ph_get_library_version(VALUE self);
-VALUE ph_enable_logging(VALUE self, VALUE level, VALUE output_file);
-VALUE ph_disable_logging(VALUE self);
-VALUE ph_log(VALUE self, VALUE level, VALUE msg_id, VALUE message);
 
+VALUE ph_get_library_version(VALUE self) {
+  const char *lib_version;
+  ph_raise(Phidget_getLibraryVersion(&lib_version));
+  return rb_str_new2(lib_version);
+}
+
+VALUE ph_add_server(VALUE self, VALUE name, VALUE address, VALUE port, VALUE password, VALUE flags) {
+  ph_raise(PhidgetNet_addServer(StringValueCStr(name), StringValueCStr(address), NUM2INT(port), StringValueCStr(password), NUM2INT(flags)));
+  return Qnil;
+}
+
+VALUE ph_remove_server(VALUE self, VALUE name) {
+  ph_raise(PhidgetNet_removeServer(StringValueCStr(name)));
+  return Qnil;
+}
+
+VALUE ph_enable_server(VALUE self, VALUE name) {
+  ph_raise(PhidgetNet_enableServer(StringValueCStr(name)));
+  return Qnil;
+}
+
+VALUE ph_disable_server(VALUE self, VALUE name, VALUE flags) {
+  ph_raise(PhidgetNet_disableServer(StringValueCStr(name), NUM2INT(flags)));
+  return Qnil;
+}
+
+VALUE ph_enable_server_discovery(VALUE self, VALUE server_type) {
+  ph_raise(PhidgetNet_enableServerDiscovery(NUM2INT(server_type)));
+  return Qnil;
+}
+
+VALUE ph_disable_server_discovery(VALUE self, VALUE server_type) {
+  ph_raise(PhidgetNet_disableServerDiscovery(NUM2INT(server_type)));
+  return Qnil;
+}
+
+VALUE ph_set_server_password(VALUE self, VALUE name, VALUE password) {
+  ph_raise(PhidgetNet_setServerPassword(StringValueCStr(name), StringValueCStr(password)));
+  return Qnil;
+}
 
 
 void Init_phidgets() {
   VALUE ph_module = rb_define_module("Phidgets");
   VALUE ph_error;
 
-  rb_define_const(ph_module, "NOTATTACHED", INT2FIX(PHIDGET_NOTATTACHED));
-  rb_define_const(ph_module, "ATTACHED", INT2FIX(PHIDGET_ATTACHED));
-
-  rb_define_const(ph_module, "CLASS_ACCELEROMETER", INT2FIX(PHIDCLASS_ACCELEROMETER));
-  rb_define_const(ph_module, "CLASS_ADVANCEDSERVO", INT2FIX(PHIDCLASS_ADVANCEDSERVO));
-  rb_define_const(ph_module, "CLASS_ANALOG", INT2FIX(PHIDCLASS_ANALOG));
-  rb_define_const(ph_module, "CLASS_BRIDGE", INT2FIX(PHIDCLASS_BRIDGE));
-  rb_define_const(ph_module, "CLASS_ENCODER", INT2FIX(PHIDCLASS_ENCODER));
-  rb_define_const(ph_module, "CLASS_FREQUENCYCOUNTER", INT2FIX(PHIDCLASS_FREQUENCYCOUNTER));
-  rb_define_const(ph_module, "CLASS_GPS", INT2FIX(PHIDCLASS_GPS));
-  rb_define_const(ph_module, "CLASS_INTERFACEKIT", INT2FIX(PHIDCLASS_INTERFACEKIT));
-  rb_define_const(ph_module, "CLASS_IR", INT2FIX(PHIDCLASS_IR));
-  rb_define_const(ph_module, "CLASS_LED", INT2FIX(PHIDCLASS_LED));
-  rb_define_const(ph_module, "CLASS_MOTORCONTROL", INT2FIX(PHIDCLASS_MOTORCONTROL));
-  rb_define_const(ph_module, "CLASS_PHSENSOR", INT2FIX(PHIDCLASS_PHSENSOR));
-  rb_define_const(ph_module, "CLASS_RFID", INT2FIX(PHIDCLASS_RFID));
-  rb_define_const(ph_module, "CLASS_SERVO", INT2FIX(PHIDCLASS_SERVO));
-  rb_define_const(ph_module, "CLASS_SPATIAL", INT2FIX(PHIDCLASS_SPATIAL));
-  rb_define_const(ph_module, "CLASS_STEPPER", INT2FIX(PHIDCLASS_STEPPER));
-  rb_define_const(ph_module, "CLASS_TEMPERATURESENSOR", INT2FIX(PHIDCLASS_TEMPERATURESENSOR));
-  rb_define_const(ph_module, "CLASS_TEXTLCD", INT2FIX(PHIDCLASS_TEXTLCD));
-  rb_define_const(ph_module, "CLASS_TEXTLED", INT2FIX(PHIDCLASS_TEXTLED));
-  rb_define_const(ph_module, "CLASS_WEIGHTSENSOR", INT2FIX(PHIDCLASS_WEIGHTSENSOR));
-
-  rb_define_const(ph_module, "ID_ACCELEROMETER_3AXIS", INT2FIX(PHIDID_ACCELEROMETER_3AXIS));
-  rb_define_const(ph_module, "ID_ADVANCEDSERVO_1MOTOR", INT2FIX(PHIDID_ADVANCEDSERVO_1MOTOR));
-  rb_define_const(ph_module, "ID_ADVANCEDSERVO_8MOTOR", INT2FIX(PHIDID_ADVANCEDSERVO_8MOTOR));
-  rb_define_const(ph_module, "ID_ANALOG_4OUTPUT", INT2FIX(PHIDID_ANALOG_4OUTPUT));
-  rb_define_const(ph_module, "ID_BIPOLAR_STEPPER_1MOTOR", INT2FIX(PHIDID_BIPOLAR_STEPPER_1MOTOR));
-  rb_define_const(ph_module, "ID_BRIDGE_4INPUT", INT2FIX(PHIDID_BRIDGE_4INPUT));
-  rb_define_const(ph_module, "ID_ENCODER_1ENCODER_1INPUT", INT2FIX(PHIDID_ENCODER_1ENCODER_1INPUT));
-  rb_define_const(ph_module, "ID_ENCODER_HS_1ENCODER", INT2FIX(PHIDID_ENCODER_HS_1ENCODER));
-  rb_define_const(ph_module, "ID_ENCODER_HS_4ENCODER_4INPUT", INT2FIX(PHIDID_ENCODER_HS_4ENCODER_4INPUT));
-  rb_define_const(ph_module, "ID_FREQUENCYCOUNTER_2INPUT", INT2FIX(PHIDID_FREQUENCYCOUNTER_2INPUT));
-  rb_define_const(ph_module, "ID_GPS", INT2FIX(PHIDID_GPS));
-  rb_define_const(ph_module, "ID_INTERFACEKIT_0_0_4", INT2FIX(PHIDID_INTERFACEKIT_0_0_4));
-  rb_define_const(ph_module, "ID_INTERFACEKIT_0_0_8", INT2FIX(PHIDID_INTERFACEKIT_0_0_8));
-  rb_define_const(ph_module, "ID_INTERFACEKIT_0_16_16", INT2FIX(PHIDID_INTERFACEKIT_0_16_16));
-  rb_define_const(ph_module, "ID_INTERFACEKIT_2_2_2", INT2FIX(PHIDID_INTERFACEKIT_2_2_2));
-  rb_define_const(ph_module, "ID_INTERFACEKIT_8_8_8", INT2FIX(PHIDID_INTERFACEKIT_8_8_8));
-  rb_define_const(ph_module, "ID_INTERFACEKIT_8_8_8_w_LCD", INT2FIX(PHIDID_INTERFACEKIT_8_8_8_w_LCD));
-  rb_define_const(ph_module, "ID_IR", INT2FIX(PHIDID_IR));
-  rb_define_const(ph_module, "ID_LED_64_ADV", INT2FIX(PHIDID_LED_64_ADV));
-  rb_define_const(ph_module, "ID_LINEAR_TOUCH", INT2FIX(PHIDID_LINEAR_TOUCH));
-  rb_define_const(ph_module, "ID_MOTORCONTROL_1MOTOR", INT2FIX(PHIDID_MOTORCONTROL_1MOTOR));
-  rb_define_const(ph_module, "ID_MOTORCONTROL_HC_2MOTOR", INT2FIX(PHIDID_MOTORCONTROL_HC_2MOTOR));
-  rb_define_const(ph_module, "ID_RFID_2OUTPUT", INT2FIX(PHIDID_RFID_2OUTPUT));
-  rb_define_const(ph_module, "ID_RFID_2OUTPUT_READ_WRITE", INT2FIX(PHIDID_RFID_2OUTPUT_READ_WRITE));
-  rb_define_const(ph_module, "ID_ROTARY_TOUCH", INT2FIX(PHIDID_ROTARY_TOUCH));
-  rb_define_const(ph_module, "ID_SPATIAL_ACCEL_3AXIS", INT2FIX(PHIDID_SPATIAL_ACCEL_3AXIS));
-  rb_define_const(ph_module, "ID_SPATIAL_ACCEL_GYRO_COMPASS", INT2FIX(PHIDID_SPATIAL_ACCEL_GYRO_COMPASS));
-  rb_define_const(ph_module, "ID_TEMPERATURESENSOR", INT2FIX(PHIDID_TEMPERATURESENSOR));
-  rb_define_const(ph_module, "ID_TEMPERATURESENSOR_4", INT2FIX(PHIDID_TEMPERATURESENSOR_4));
-  rb_define_const(ph_module, "ID_TEMPERATURESENSOR_IR", INT2FIX(PHIDID_TEMPERATURESENSOR_IR));
-  rb_define_const(ph_module, "ID_TEXTLCD_2x20_w_8_8_8", INT2FIX(PHIDID_TEXTLCD_2x20_w_8_8_8));
-  rb_define_const(ph_module, "ID_TEXTLCD_ADAPTER", INT2FIX(PHIDID_TEXTLCD_ADAPTER));
-  rb_define_const(ph_module, "ID_UNIPOLAR_STEPPER_4MOTOR", INT2FIX(PHIDID_UNIPOLAR_STEPPER_4MOTOR));
-  rb_define_const(ph_module, "ID_ACCELEROMETER_2AXIS", INT2FIX(PHIDID_ACCELEROMETER_2AXIS));
-  rb_define_const(ph_module, "ID_INTERFACEKIT_0_8_8_w_LCD", INT2FIX(PHIDID_INTERFACEKIT_0_8_8_w_LCD));
-  rb_define_const(ph_module, "ID_INTERFACEKIT_4_8_8", INT2FIX(PHIDID_INTERFACEKIT_4_8_8));
-  rb_define_const(ph_module, "ID_LED_64", INT2FIX(PHIDID_LED_64));
-  rb_define_const(ph_module, "ID_MOTORCONTROL_LV_2MOTOR_4INPUT", INT2FIX(PHIDID_MOTORCONTROL_LV_2MOTOR_4INPUT));
-  rb_define_const(ph_module, "ID_PHSENSOR", INT2FIX(PHIDID_PHSENSOR));
-  rb_define_const(ph_module, "ID_RFID", INT2FIX(PHIDID_RFID));
-  rb_define_const(ph_module, "ID_SERVO_1MOTOR", INT2FIX(PHIDID_SERVO_1MOTOR));
-  rb_define_const(ph_module, "ID_SERVO_1MOTOR_OLD", INT2FIX(PHIDID_SERVO_1MOTOR_OLD));
-  rb_define_const(ph_module, "ID_SERVO_4MOTOR", INT2FIX(PHIDID_SERVO_4MOTOR));
-  rb_define_const(ph_module, "ID_SERVO_4MOTOR_OLD", INT2FIX(PHIDID_SERVO_4MOTOR_OLD));
-  rb_define_const(ph_module, "ID_TEXTLCD_2x20", INT2FIX(PHIDID_TEXTLCD_2x20));
-  rb_define_const(ph_module, "ID_TEXTLCD_2x20_w_0_8_8", INT2FIX(PHIDID_TEXTLCD_2x20_w_0_8_8));
-  rb_define_const(ph_module, "ID_TEXTLED_1x8", INT2FIX(PHIDID_TEXTLED_1x8));
-  rb_define_const(ph_module, "ID_TEXTLED_4x8", INT2FIX(PHIDID_TEXTLED_4x8));
-  rb_define_const(ph_module, "ID_WEIGHTSENSOR", INT2FIX(PHIDID_WEIGHTSENSOR));
-  rb_define_const(ph_module, "ID_FIRMWARE_UPGRADE", INT2FIX(PHIDID_FIRMWARE_UPGRADE));
-
-  rb_define_const(ph_module, "LOG_CRITICAL", INT2FIX(PHIDGET_LOG_CRITICAL));
-  rb_define_const(ph_module, "LOG_ERROR", INT2FIX(PHIDGET_LOG_ERROR));
-  rb_define_const(ph_module, "LOG_WARNING", INT2FIX(PHIDGET_LOG_WARNING));
-  rb_define_const(ph_module, "LOG_DEBUG", INT2FIX(PHIDGET_LOG_DEBUG));
-  rb_define_const(ph_module, "LOG_INFO", INT2FIX(PHIDGET_LOG_INFO));
-  rb_define_const(ph_module, "LOG_VERBOSE", INT2FIX(PHIDGET_LOG_VERBOSE));
+  rb_define_const(ph_module, "SERVER_DEVICEREMOTE", INT2NUM(PHIDGETSERVER_DEVICEREMOTE));
+  rb_define_const(ph_module, "SERVER_WWWREMOTE", INT2NUM(PHIDGETSERVER_WWWREMOTE));
+  rb_define_const(ph_module, "SERVER_SBC", INT2NUM(PHIDGETSERVER_SBC));
+
+  rb_define_const(ph_module, "SERIALNUMBER_ANY", INT2NUM(PHIDGET_SERIALNUMBER_ANY));
+  rb_define_const(ph_module, "HUBPORT_ANY", INT2NUM(PHIDGET_HUBPORT_ANY));
+  rb_define_const(ph_module, "CHANNEL_ANY", INT2NUM(PHIDGET_CHANNEL_ANY));
+  rb_define_const(ph_module, "LABEL_ANY", Qnil);
+  rb_define_const(ph_module, "TIMEOUT_INFINITE", INT2NUM(PHIDGET_TIMEOUT_INFINITE));
+  rb_define_const(ph_module, "TIMEOUT_DEFAULT", INT2NUM(PHIDGET_TIMEOUT_DEFAULT));
+  rb_define_const(ph_module, "SERVER_AUTHREQUIRED", INT2NUM(PHIDGETSERVER_AUTHREQUIRED));
+
+  rb_define_const(ph_module, "CLASS_NOTHING", INT2NUM(PHIDCLASS_NOTHING));
+  rb_define_const(ph_module, "CLASS_ACCELEROMETER", INT2NUM(PHIDCLASS_ACCELEROMETER));
+  rb_define_const(ph_module, "CLASS_ADVANCEDSERVO", INT2NUM(PHIDCLASS_ADVANCEDSERVO));
+  rb_define_const(ph_module, "CLASS_ANALOG", INT2NUM(PHIDCLASS_ANALOG));
+  rb_define_const(ph_module, "CLASS_BRIDGE", INT2NUM(PHIDCLASS_BRIDGE));
+  rb_define_const(ph_module, "CLASS_ENCODER", INT2NUM(PHIDCLASS_ENCODER));
+  rb_define_const(ph_module, "CLASS_FREQUENCYCOUNTER", INT2NUM(PHIDCLASS_FREQUENCYCOUNTER));
+  rb_define_const(ph_module, "CLASS_GPS", INT2NUM(PHIDCLASS_GPS));
+  rb_define_const(ph_module, "CLASS_INTERFACEKIT", INT2NUM(PHIDCLASS_INTERFACEKIT));
+  rb_define_const(ph_module, "CLASS_IR", INT2NUM(PHIDCLASS_IR));
+  rb_define_const(ph_module, "CLASS_LED", INT2NUM(PHIDCLASS_LED));
+  rb_define_const(ph_module, "CLASS_MOTORCONTROL", INT2NUM(PHIDCLASS_MOTORCONTROL));
+  rb_define_const(ph_module, "CLASS_PHSENSOR", INT2NUM(PHIDCLASS_PHSENSOR));
+  rb_define_const(ph_module, "CLASS_RFID", INT2NUM(PHIDCLASS_RFID));
+  rb_define_const(ph_module, "CLASS_SERVO", INT2NUM(PHIDCLASS_SERVO));
+  rb_define_const(ph_module, "CLASS_SPATIAL", INT2NUM(PHIDCLASS_SPATIAL));
+  rb_define_const(ph_module, "CLASS_STEPPER", INT2NUM(PHIDCLASS_STEPPER));
+  rb_define_const(ph_module, "CLASS_TEMPERATURESENSOR", INT2NUM(PHIDCLASS_TEMPERATURESENSOR));
+  rb_define_const(ph_module, "CLASS_TEXTLCD", INT2NUM(PHIDCLASS_TEXTLCD));
+  rb_define_const(ph_module, "CLASS_HUB", INT2NUM(PHIDCLASS_HUB));
+  rb_define_const(ph_module, "CLASS_MESHDONGLE", INT2NUM(PHIDCLASS_MESHDONGLE));
+  rb_define_const(ph_module, "CLASS_VINT", INT2NUM(PHIDCLASS_VINT));
+  rb_define_const(ph_module, "CLASS_GENERIC", INT2NUM(PHIDCLASS_GENERIC));
+  rb_define_const(ph_module, "CLASS_FIRMWAREUPGRADE", INT2NUM(PHIDCLASS_FIRMWAREUPGRADE));
+  rb_define_const(ph_module, "CLASS_DICTIONARY", INT2NUM(PHIDCLASS_DICTIONARY));
+
+  rb_define_const(ph_module, "CHCLASS_NOTHING", INT2NUM(PHIDCHCLASS_NOTHING));
+  rb_define_const(ph_module, "CHCLASS_ACCELEROMETER", INT2NUM(PHIDCHCLASS_ACCELEROMETER));
+  rb_define_const(ph_module, "CHCLASS_CURRENTINPUT", INT2NUM(PHIDCHCLASS_CURRENTINPUT));
+  rb_define_const(ph_module, "CHCLASS_DATAADAPTER", INT2NUM(PHIDCHCLASS_DATAADAPTER));
+  rb_define_const(ph_module, "CHCLASS_DCMOTOR", INT2NUM(PHIDCHCLASS_DCMOTOR));
+  rb_define_const(ph_module, "CHCLASS_DIGITALINPUT", INT2NUM(PHIDCHCLASS_DIGITALINPUT));
+  rb_define_const(ph_module, "CHCLASS_DIGITALOUTPUT", INT2NUM(PHIDCHCLASS_DIGITALOUTPUT));
+  rb_define_const(ph_module, "CHCLASS_DISTANCESENSOR", INT2NUM(PHIDCHCLASS_DISTANCESENSOR));
+  rb_define_const(ph_module, "CHCLASS_ENCODER", INT2NUM(PHIDCHCLASS_ENCODER));
+  rb_define_const(ph_module, "CHCLASS_FREQUENCYCOUNTER", INT2NUM(PHIDCHCLASS_FREQUENCYCOUNTER));
+  rb_define_const(ph_module, "CHCLASS_GPS", INT2NUM(PHIDCHCLASS_GPS));
+  rb_define_const(ph_module, "CHCLASS_LCD", INT2NUM(PHIDCHCLASS_LCD));
+  rb_define_const(ph_module, "CHCLASS_GYROSCOPE", INT2NUM(PHIDCHCLASS_GYROSCOPE));
+  rb_define_const(ph_module, "CHCLASS_HUB", INT2NUM(PHIDCHCLASS_HUB));
+  rb_define_const(ph_module, "CHCLASS_CAPACITIVETOUCH", INT2NUM(PHIDCHCLASS_CAPACITIVETOUCH));
+  rb_define_const(ph_module, "CHCLASS_HUMIDITYSENSOR", INT2NUM(PHIDCHCLASS_HUMIDITYSENSOR));
+  rb_define_const(ph_module, "CHCLASS_IR", INT2NUM(PHIDCHCLASS_IR));
+  rb_define_const(ph_module, "CHCLASS_LIGHTSENSOR", INT2NUM(PHIDCHCLASS_LIGHTSENSOR));
+  rb_define_const(ph_module, "CHCLASS_MAGNETOMETER", INT2NUM(PHIDCHCLASS_MAGNETOMETER));
+  rb_define_const(ph_module, "CHCLASS_MESHDONGLE", INT2NUM(PHIDCHCLASS_MESHDONGLE));
+  rb_define_const(ph_module, "CHCLASS_PHSENSOR", INT2NUM(PHIDCHCLASS_PHSENSOR));
+  rb_define_const(ph_module, "CHCLASS_POWERGUARD", INT2NUM(PHIDCHCLASS_POWERGUARD));
+  rb_define_const(ph_module, "CHCLASS_PRESSURESENSOR", INT2NUM(PHIDCHCLASS_PRESSURESENSOR));
+  rb_define_const(ph_module, "CHCLASS_RCSERVO", INT2NUM(PHIDCHCLASS_RCSERVO));
+  rb_define_const(ph_module, "CHCLASS_RESISTANCEINPUT", INT2NUM(PHIDCHCLASS_RESISTANCEINPUT));
+  rb_define_const(ph_module, "CHCLASS_RFID", INT2NUM(PHIDCHCLASS_RFID));
+  rb_define_const(ph_module, "CHCLASS_SOUNDSENSOR", INT2NUM(PHIDCHCLASS_SOUNDSENSOR));
+  rb_define_const(ph_module, "CHCLASS_SPATIAL", INT2NUM(PHIDCHCLASS_SPATIAL));
+  rb_define_const(ph_module, "CHCLASS_STEPPER", INT2NUM(PHIDCHCLASS_STEPPER));
+  rb_define_const(ph_module, "CHCLASS_TEMPERATURESENSOR", INT2NUM(PHIDCHCLASS_TEMPERATURESENSOR));
+  rb_define_const(ph_module, "CHCLASS_VOLTAGEINPUT", INT2NUM(PHIDCHCLASS_VOLTAGEINPUT));
+  rb_define_const(ph_module, "CHCLASS_VOLTAGEOUTPUT", INT2NUM(PHIDCHCLASS_VOLTAGEOUTPUT));
+  rb_define_const(ph_module, "CHCLASS_VOLTAGERATIOINPUT", INT2NUM(PHIDCHCLASS_VOLTAGERATIOINPUT));
+  rb_define_const(ph_module, "CHCLASS_FIRMWAREUPGRADE", INT2NUM(PHIDCHCLASS_FIRMWAREUPGRADE));
+  rb_define_const(ph_module, "CHCLASS_GENERIC", INT2NUM(PHIDCHCLASS_GENERIC));
+  rb_define_const(ph_module, "CHCLASS_MOTORPOSITIONCONTROLLER", INT2NUM(PHIDCHCLASS_MOTORPOSITIONCONTROLLER));
+  rb_define_const(ph_module, "CHCLASS_BLDCMOTOR", INT2NUM(PHIDCHCLASS_BLDCMOTOR));
+  rb_define_const(ph_module, "CHCLASS_DICTIONARY", INT2NUM(PHIDCHCLASS_DICTIONARY));
+  rb_define_const(ph_module, "CHCLASS_CURRENTOUTPUT", INT2NUM(PHIDCHCLASS_CURRENTOUTPUT));
+
+  rb_define_const(ph_module, "CHSUBCLASS_NONE", INT2NUM(PHIDCHSUBCLASS_NONE));
+  rb_define_const(ph_module, "CHSUBCLASS_DIGITALOUTPUT_DUTY_CYCLE", INT2NUM(PHIDCHSUBCLASS_DIGITALOUTPUT_DUTY_CYCLE));
+  rb_define_const(ph_module, "CHSUBCLASS_DIGITALOUTPUT_LED_DRIVER", INT2NUM(PHIDCHSUBCLASS_DIGITALOUTPUT_LED_DRIVER));
+  rb_define_const(ph_module, "CHSUBCLASS_TEMPERATURESENSOR_RTD", INT2NUM(PHIDCHSUBCLASS_TEMPERATURESENSOR_RTD));
+  rb_define_const(ph_module, "CHSUBCLASS_TEMPERATURESENSOR_THERMOCOUPLE", INT2NUM(PHIDCHSUBCLASS_TEMPERATURESENSOR_THERMOCOUPLE));
+  rb_define_const(ph_module, "CHSUBCLASS_VOLTAGEINPUT_SENSOR_PORT", INT2NUM(PHIDCHSUBCLASS_VOLTAGEINPUT_SENSOR_PORT));
+  rb_define_const(ph_module, "CHSUBCLASS_VOLTAGERATIOINPUT_SENSOR_PORT", INT2NUM(PHIDCHSUBCLASS_VOLTAGERATIOINPUT_SENSOR_PORT));
+  rb_define_const(ph_module, "CHSUBCLASS_VOLTAGERATIOINPUT_BRIDGE", INT2NUM(PHIDCHSUBCLASS_VOLTAGERATIOINPUT_BRIDGE));
+  rb_define_const(ph_module, "CHSUBCLASS_LCD_GRAPHIC", INT2NUM(PHIDCHSUBCLASS_LCD_GRAPHIC));
+  rb_define_const(ph_module, "CHSUBCLASS_LCD_TEXT", INT2NUM(PHIDCHSUBCLASS_LCD_TEXT));
+  rb_define_const(ph_module, "CHSUBCLASS_ENCODER_MODE_SETTABLE", INT2NUM(PHIDCHSUBCLASS_ENCODER_MODE_SETTABLE));
+
+  rb_define_const(ph_module, "ID_NOTHING", INT2NUM(PHIDID_NOTHING));
+  rb_define_const(ph_module, "ID_INTERFACEKIT_4_8_8", INT2NUM(PHIDID_INTERFACEKIT_4_8_8));
+  rb_define_const(ph_module, "ID_1000", INT2NUM(PHIDID_1000));
+  rb_define_const(ph_module, "ID_1001", INT2NUM(PHIDID_1001));
+  rb_define_const(ph_module, "ID_1002", INT2NUM(PHIDID_1002));
+  rb_define_const(ph_module, "ID_1008", INT2NUM(PHIDID_1008));
+  rb_define_const(ph_module, "ID_1010_1013_1018_1019", INT2NUM(PHIDID_1010_1013_1018_1019));
+  rb_define_const(ph_module, "ID_1011", INT2NUM(PHIDID_1011));
+  rb_define_const(ph_module, "ID_1012", INT2NUM(PHIDID_1012));
+  rb_define_const(ph_module, "ID_1014", INT2NUM(PHIDID_1014));
+  rb_define_const(ph_module, "ID_1015", INT2NUM(PHIDID_1015));
+  rb_define_const(ph_module, "ID_1016", INT2NUM(PHIDID_1016));
+  rb_define_const(ph_module, "ID_1017", INT2NUM(PHIDID_1017));
+  rb_define_const(ph_module, "ID_1023", INT2NUM(PHIDID_1023));
+  rb_define_const(ph_module, "ID_1024", INT2NUM(PHIDID_1024));
+  rb_define_const(ph_module, "ID_1030", INT2NUM(PHIDID_1030));
+  rb_define_const(ph_module, "ID_1031", INT2NUM(PHIDID_1031));
+  rb_define_const(ph_module, "ID_1032", INT2NUM(PHIDID_1032));
+  rb_define_const(ph_module, "ID_1040", INT2NUM(PHIDID_1040));
+  rb_define_const(ph_module, "ID_1041", INT2NUM(PHIDID_1041));
+  rb_define_const(ph_module, "ID_1042", INT2NUM(PHIDID_1042));
+  rb_define_const(ph_module, "ID_1043", INT2NUM(PHIDID_1043));
+  rb_define_const(ph_module, "ID_1044", INT2NUM(PHIDID_1044));
+  rb_define_const(ph_module, "ID_1045", INT2NUM(PHIDID_1045));
+  rb_define_const(ph_module, "ID_1046", INT2NUM(PHIDID_1046));
+  rb_define_const(ph_module, "ID_1047", INT2NUM(PHIDID_1047));
+  rb_define_const(ph_module, "ID_1048", INT2NUM(PHIDID_1048));
+  rb_define_const(ph_module, "ID_1049", INT2NUM(PHIDID_1049));
+  rb_define_const(ph_module, "ID_1051", INT2NUM(PHIDID_1051));
+  rb_define_const(ph_module, "ID_1052", INT2NUM(PHIDID_1052));
+  rb_define_const(ph_module, "ID_1053", INT2NUM(PHIDID_1053));
+  rb_define_const(ph_module, "ID_1054", INT2NUM(PHIDID_1054));
+  rb_define_const(ph_module, "ID_1055", INT2NUM(PHIDID_1055));
+  rb_define_const(ph_module, "ID_1056", INT2NUM(PHIDID_1056));
+  rb_define_const(ph_module, "ID_1057", INT2NUM(PHIDID_1057));
+  rb_define_const(ph_module, "ID_1058", INT2NUM(PHIDID_1058));
+  rb_define_const(ph_module, "ID_1059", INT2NUM(PHIDID_1059));
+  rb_define_const(ph_module, "ID_1060", INT2NUM(PHIDID_1060));
+  rb_define_const(ph_module, "ID_1061", INT2NUM(PHIDID_1061));
+  rb_define_const(ph_module, "ID_1062", INT2NUM(PHIDID_1062));
+  rb_define_const(ph_module, "ID_1063", INT2NUM(PHIDID_1063));
+  rb_define_const(ph_module, "ID_1064", INT2NUM(PHIDID_1064));
+  rb_define_const(ph_module, "ID_1065", INT2NUM(PHIDID_1065));
+  rb_define_const(ph_module, "ID_1066", INT2NUM(PHIDID_1066));
+  rb_define_const(ph_module, "ID_1067", INT2NUM(PHIDID_1067));
+  rb_define_const(ph_module, "ID_1202_1203", INT2NUM(PHIDID_1202_1203));
+  rb_define_const(ph_module, "ID_1204", INT2NUM(PHIDID_1204));
+  rb_define_const(ph_module, "ID_1215__1218", INT2NUM(PHIDID_1215__1218));
+  rb_define_const(ph_module, "ID_1219__1222", INT2NUM(PHIDID_1219__1222));
+  rb_define_const(ph_module, "ID_ADP1000", INT2NUM(PHIDID_ADP1000));
+  rb_define_const(ph_module, "ID_ADP1001", INT2NUM(PHIDID_ADP1001));
+  rb_define_const(ph_module, "ID_DAQ1000", INT2NUM(PHIDID_DAQ1000));
+  rb_define_const(ph_module, "ID_DAQ1200", INT2NUM(PHIDID_DAQ1200));
+  rb_define_const(ph_module, "ID_DAQ1300", INT2NUM(PHIDID_DAQ1300));
+  rb_define_const(ph_module, "ID_DAQ1301", INT2NUM(PHIDID_DAQ1301));
+  rb_define_const(ph_module, "ID_DAQ1400", INT2NUM(PHIDID_DAQ1400));
+  rb_define_const(ph_module, "ID_DAQ1500", INT2NUM(PHIDID_DAQ1500));
+  rb_define_const(ph_module, "ID_DCC1000", INT2NUM(PHIDID_DCC1000));
+  rb_define_const(ph_module, "ID_DST1000", INT2NUM(PHIDID_DST1000));
+  rb_define_const(ph_module, "ID_DST1200", INT2NUM(PHIDID_DST1200));
+  rb_define_const(ph_module, "ID_ENC1000", INT2NUM(PHIDID_ENC1000));
+  rb_define_const(ph_module, "ID_HIN1000", INT2NUM(PHIDID_HIN1000));
+  rb_define_const(ph_module, "ID_HIN1001", INT2NUM(PHIDID_HIN1001));
+  rb_define_const(ph_module, "ID_HIN1100", INT2NUM(PHIDID_HIN1100));
+  rb_define_const(ph_module, "ID_HUB0000", INT2NUM(PHIDID_HUB0000));
+  rb_define_const(ph_module, "ID_HUB0001", INT2NUM(PHIDID_HUB0001));
+  rb_define_const(ph_module, "ID_HUB0002", INT2NUM(PHIDID_HUB0002));
+  rb_define_const(ph_module, "ID_HUB0004", INT2NUM(PHIDID_HUB0004));
+  rb_define_const(ph_module, "ID_HUB0005", INT2NUM(PHIDID_HUB0005));
+  rb_define_const(ph_module, "ID_HUM1000", INT2NUM(PHIDID_HUM1000));
+  rb_define_const(ph_module, "ID_LCD1100", INT2NUM(PHIDID_LCD1100));
+  rb_define_const(ph_module, "ID_LED1000", INT2NUM(PHIDID_LED1000));
+  rb_define_const(ph_module, "ID_LUX1000", INT2NUM(PHIDID_LUX1000));
+  rb_define_const(ph_module, "ID_MOT1100", INT2NUM(PHIDID_MOT1100));
+  rb_define_const(ph_module, "ID_MOT1101", INT2NUM(PHIDID_MOT1101));
+  rb_define_const(ph_module, "ID_OUT1000", INT2NUM(PHIDID_OUT1000));
+  rb_define_const(ph_module, "ID_OUT1001", INT2NUM(PHIDID_OUT1001));
+  rb_define_const(ph_module, "ID_OUT1002", INT2NUM(PHIDID_OUT1002));
+  rb_define_const(ph_module, "ID_OUT1100", INT2NUM(PHIDID_OUT1100));
+  rb_define_const(ph_module, "ID_PRE1000", INT2NUM(PHIDID_PRE1000));
+  rb_define_const(ph_module, "ID_RCC1000", INT2NUM(PHIDID_RCC1000));
+  rb_define_const(ph_module, "ID_REL1000", INT2NUM(PHIDID_REL1000));
+  rb_define_const(ph_module, "ID_REL1100", INT2NUM(PHIDID_REL1100));
+  rb_define_const(ph_module, "ID_REL1101", INT2NUM(PHIDID_REL1101));
+  rb_define_const(ph_module, "ID_SAF1000", INT2NUM(PHIDID_SAF1000));
+  rb_define_const(ph_module, "ID_SND1000", INT2NUM(PHIDID_SND1000));
+  rb_define_const(ph_module, "ID_STC1000", INT2NUM(PHIDID_STC1000));
+  rb_define_const(ph_module, "ID_TMP1000", INT2NUM(PHIDID_TMP1000));
+  rb_define_const(ph_module, "ID_TMP1100", INT2NUM(PHIDID_TMP1100));
+  rb_define_const(ph_module, "ID_TMP1101", INT2NUM(PHIDID_TMP1101));
+  rb_define_const(ph_module, "ID_TMP1200", INT2NUM(PHIDID_TMP1200));
+  rb_define_const(ph_module, "ID_TMP1300", INT2NUM(PHIDID_TMP1300));
+  rb_define_const(ph_module, "ID_VCP1000", INT2NUM(PHIDID_VCP1000));
+  rb_define_const(ph_module, "ID_VCP1001", INT2NUM(PHIDID_VCP1001));
+  rb_define_const(ph_module, "ID_VCP1002", INT2NUM(PHIDID_VCP1002));
+  rb_define_const(ph_module, "ID_DIGITALINPUT_PORT", INT2NUM(PHIDID_DIGITALINPUT_PORT));
+  rb_define_const(ph_module, "ID_DIGITALOUTPUT_PORT", INT2NUM(PHIDID_DIGITALOUTPUT_PORT));
+  rb_define_const(ph_module, "ID_VOLTAGEINPUT_PORT", INT2NUM(PHIDID_VOLTAGEINPUT_PORT));
+  rb_define_const(ph_module, "ID_VOLTAGERATIOINPUT_PORT", INT2NUM(PHIDID_VOLTAGERATIOINPUT_PORT));
+  rb_define_const(ph_module, "ID_GENERICUSB", INT2NUM(PHIDID_GENERICUSB));
+  rb_define_const(ph_module, "ID_GENERICVINT", INT2NUM(PHIDID_GENERICVINT));
+  rb_define_const(ph_module, "ID_FIRMWARE_UPGRADE_USB", INT2NUM(PHIDID_FIRMWARE_UPGRADE_USB));
+  rb_define_const(ph_module, "ID_FIRMWARE_UPGRADE_STM32F0", INT2NUM(PHIDID_FIRMWARE_UPGRADE_STM32F0));
+  rb_define_const(ph_module, "ID_FIRMWARE_UPGRADE_STM8S", INT2NUM(PHIDID_FIRMWARE_UPGRADE_STM8S));
+  rb_define_const(ph_module, "ID_FIRMWARE_UPGRADE_SPI", INT2NUM(PHIDID_FIRMWARE_UPGRADE_SPI));
+  rb_define_const(ph_module, "ID_VCP1100", INT2NUM(PHIDID_VCP1100));
+  rb_define_const(ph_module, "ID_DCC1100", INT2NUM(PHIDID_DCC1100));
+  rb_define_const(ph_module, "ID_HIN1101", INT2NUM(PHIDID_HIN1101));
+  rb_define_const(ph_module, "ID_DCC1001", INT2NUM(PHIDID_DCC1001));
+  rb_define_const(ph_module, "ID_DICTIONARY", INT2NUM(PHIDID_DICTIONARY));
+  rb_define_const(ph_module, "ID_STC1001", INT2NUM(PHIDID_STC1001));
+  rb_define_const(ph_module, "ID_USBSWITCH", INT2NUM(PHIDID_USBSWITCH));
+  rb_define_const(ph_module, "ID_DCC1002", INT2NUM(PHIDID_DCC1002));
+  rb_define_const(ph_module, "ID_STC1002", INT2NUM(PHIDID_STC1002));
+  rb_define_const(ph_module, "ID_STC1003", INT2NUM(PHIDID_STC1003));
+  rb_define_const(ph_module, "ID_DCC1003", INT2NUM(PHIDID_DCC1003));
+  rb_define_const(ph_module, "ID_DST1001", INT2NUM(PHIDID_DST1001));
+  rb_define_const(ph_module, "ID_CURLOOP", INT2NUM(PHIDID_CURLOOP));
+  rb_define_const(ph_module, "ID_HUB5000", INT2NUM(PHIDID_HUB5000));
+  rb_define_const(ph_module, "ID_RCC0004", INT2NUM(PHIDID_RCC0004));
+
+  rb_define_const(ph_module, "INPUT_MODE_NPN", INT2NUM(INPUT_MODE_NPN));
+  rb_define_const(ph_module, "INPUT_MODE_PNP", INT2NUM(INPUT_MODE_PNP));
+
+  rb_define_const(ph_module, "POWER_SUPPLY_OFF", INT2NUM(POWER_SUPPLY_OFF));
+  rb_define_const(ph_module, "POWER_SUPPLY_12V", INT2NUM(POWER_SUPPLY_12V));
+  rb_define_const(ph_module, "POWER_SUPPLY_24V", INT2NUM(POWER_SUPPLY_24V));
+
+  rb_define_const(ph_module, "RTD_WIRE_SETUP_2WIRE", INT2NUM(RTD_WIRE_SETUP_2WIRE));
+  rb_define_const(ph_module, "RTD_WIRE_SETUP_3WIRE", INT2NUM(RTD_WIRE_SETUP_3WIRE));
+  rb_define_const(ph_module, "RTD_WIRE_SETUP_4WIRE", INT2NUM(RTD_WIRE_SETUP_4WIRE));
+
+  rb_define_const(ph_module, "FAN_MODE_OFF", INT2NUM(FAN_MODE_OFF));
+  rb_define_const(ph_module, "FAN_MODE_ON", INT2NUM(FAN_MODE_ON));
+  rb_define_const(ph_module, "FAN_MODE_AUTO", INT2NUM(FAN_MODE_AUTO));
 
   ph_error = rb_define_class_under(ph_module, "Error", rb_eStandardError);
-  ph_errors[EPHIDGET_NOTFOUND] = rb_define_class_under(ph_error, "NotFound", ph_error);
-  ph_errors[EPHIDGET_NOMEMORY] = rb_define_class_under(ph_error, "NoMemory", ph_error);
-  ph_errors[EPHIDGET_UNEXPECTED] = rb_define_class_under(ph_error, "Unexpected", ph_error);
-  ph_errors[EPHIDGET_INVALIDARG] = rb_define_class_under(ph_error, "InvalidArg", ph_error);
-  ph_errors[EPHIDGET_NOTATTACHED] = rb_define_class_under(ph_error, "NotAttached", ph_error);
-  ph_errors[EPHIDGET_INTERRUPTED] = rb_define_class_under(ph_error, "Interrupted", ph_error);
-  ph_errors[EPHIDGET_INVALID] = rb_define_class_under(ph_error, "Invalid", ph_error);
-  ph_errors[EPHIDGET_NETWORK] = rb_define_class_under(ph_error, "Network", ph_error);
-  ph_errors[EPHIDGET_UNKNOWNVAL] = rb_define_class_under(ph_error, "UnknownVal", ph_error);
-  ph_errors[EPHIDGET_BADPASSWORD] = rb_define_class_under(ph_error, "BadPassword", ph_error);
-  ph_errors[EPHIDGET_UNSUPPORTED] = rb_define_class_under(ph_error, "Unsupported", ph_error);
-  ph_errors[EPHIDGET_DUPLICATE] = rb_define_class_under(ph_error, "Duplicate", ph_error);
-  ph_errors[EPHIDGET_TIMEOUT] = rb_define_class_under(ph_error, "Timeout", ph_error);
-  ph_errors[EPHIDGET_OUTOFBOUNDS] = rb_define_class_under(ph_error, "OutOfBounds", ph_error);
-  ph_errors[EPHIDGET_EVENT] = rb_define_class_under(ph_error, "Event", ph_error);
-  ph_errors[EPHIDGET_NETWORK_NOTCONNECTED] = rb_define_class_under(ph_error, "NetworkNotConnected", ph_error);
-  ph_errors[EPHIDGET_WRONGDEVICE] = rb_define_class_under(ph_error, "WrongDevice", ph_error);
-  ph_errors[EPHIDGET_CLOSED] = rb_define_class_under(ph_error, "Closed", ph_error);
-  ph_errors[EPHIDGET_BADVERSION] = rb_define_class_under(ph_error, "BadVersion", ph_error);
-  ph_errors[EPHIDGET_NOTIMPLEMENTED] = rb_define_class_under(ph_error, "NotImplemented", ph_error);
+  rb_define_class_under(ph_error, "NotPermitted", ph_error);
+  rb_define_class_under(ph_error, "NoSuchEntity", ph_error);
+  rb_define_class_under(ph_error, "TimedOut", ph_error);
+  rb_define_class_under(ph_error, "KeepAliveFailure", ph_error);
+  rb_define_class_under(ph_error, "OpInterrupted", ph_error);
+  rb_define_class_under(ph_error, "IOError", ph_error);
+  rb_define_class_under(ph_error, "MemoryError", ph_error);
+  rb_define_class_under(ph_error, "AccessError", ph_error);
+  rb_define_class_under(ph_error, "AddressError", ph_error);
+  rb_define_class_under(ph_error, "ResourceBusy", ph_error);
+  rb_define_class_under(ph_error, "ObjectExists", ph_error);
+  rb_define_class_under(ph_error, "ObjectNotDirectory", ph_error);
+  rb_define_class_under(ph_error, "ObjectIsDirectory", ph_error);
+  rb_define_class_under(ph_error, "Invalid", ph_error);
+  rb_define_class_under(ph_error, "TooManyOpenFilesInSystem", ph_error);
+  rb_define_class_under(ph_error, "TooManyOpenFiles", ph_error);
+  rb_define_class_under(ph_error, "NoSpace", ph_error);
+  rb_define_class_under(ph_error, "FileTooBig", ph_error);
+  rb_define_class_under(ph_error, "ReadOnlyFilesystem", ph_error);
+  rb_define_class_under(ph_error, "ReadOnlyObject", ph_error);
+  rb_define_class_under(ph_error, "OpNotSupported", ph_error);
+  rb_define_class_under(ph_error, "InvalidArg", ph_error);
+  rb_define_class_under(ph_error, "TryAgain", ph_error);
+  rb_define_class_under(ph_error, "NotEmpty", ph_error);
+  rb_define_class_under(ph_error, "UnexpectedError", ph_error);
+  rb_define_class_under(ph_error, "Duplicate", ph_error);
+  rb_define_class_under(ph_error, "BadCredential", ph_error);
+  rb_define_class_under(ph_error, "NetworkUnavailable", ph_error);
+  rb_define_class_under(ph_error, "ConnectionRefused", ph_error);
+  rb_define_class_under(ph_error, "ConnectionReset", ph_error);
+  rb_define_class_under(ph_error, "NoRouteToHost", ph_error);
+  rb_define_class_under(ph_error, "NoSuchDevice", ph_error);
+  rb_define_class_under(ph_error, "WrongDevice", ph_error);
+  rb_define_class_under(ph_error, "BrokenPipe", ph_error);
+  rb_define_class_under(ph_error, "NameResolutionError", ph_error);
+  rb_define_class_under(ph_error, "UnknownValue", ph_error);
+  rb_define_class_under(ph_error, "DeviceNotAttached", ph_error);
+  rb_define_class_under(ph_error, "InvalidPacket", ph_error);
+  rb_define_class_under(ph_error, "ArgListTooLong", ph_error);
+  rb_define_class_under(ph_error, "BadVersion", ph_error);
+  rb_define_class_under(ph_error, "Closed", ph_error);
+  rb_define_class_under(ph_error, "NotConfigured", ph_error);
+  rb_define_class_under(ph_error, "EndOfFile", ph_error);
+  rb_define_class_under(ph_error, "NotImplemented", ph_error);
+  rb_define_class_under(ph_error, "UnknownError", ph_error);
 
   /*
    * Document-method: getLibraryVersion
@@ -129,78 +333,128 @@ void Init_phidgets() {
    * Gets the library version. This contains a version number and a build date.
    */
   rb_define_singleton_method(ph_module, "getLibraryVersion", ph_get_library_version, 0);
+  rb_define_singleton_method(ph_module, "library_version", ph_get_library_version, 0);
+
 
   /*
-   * Document-method: library_version
-   * call-seq: library_version -> version
+   * Document-method: addServer
+   * call-seq: addServer(server_name, address, port, password, flags)
    *
-   * Gets the library version. This contains a version number and a build date.
+   * Registers a server that the client (your program) will try to connect to. The client will continually try to connect to the server, increasing the time between each attempt to a maximum interval of 16 seconds.
+   * This call is intended for use when server discovery is not enabled, or to connect to a server that is not discoverable.
+   * The server name used by this function does not have to match the name of the server running on the host machine. Only the address, port, and password need to match.
+   * This call will fail if a server with the same name has already been discovered.
+   * This call will fail if PhidgetNet_setServerPassword() has already been called with the same server name, as PhidgetNet_setServerPassword() registers the server entry anticipating the discovery of the server.
    */
-  rb_define_singleton_method(ph_module, "library_version", ph_get_library_version, 0);
+  rb_define_singleton_method(ph_module, "addServer", ph_add_server, 5);
+  rb_define_singleton_method(ph_module, "add_server", ph_add_server, 5);
+
 
   /*
-   * Document-method: enableLogging
-   * call-seq: enableLogging(log_level, output_file)
+   * Document-method: removeServer
+   * call-seq: removeServer(server_name)
    *
-   * Enables logging.
+   * Removes a registration for a server that the client (your program) is trying to connect to.If the client is currently connected to the server, the connection will be closed.
+   * If the server was discovered (not added by PhidgetNet_addServer()), the connection may be reestablished if and when the server is rediscovered. PhidgetNet_disableServer()
+   * should be used to prevent the reconnection of a discovered server.
    */
-  rb_define_singleton_method(ph_module, "enableLogging", ph_enable_logging, 2);
+  rb_define_singleton_method(ph_module, "removeServer", ph_remove_server, 1);
+  rb_define_singleton_method(ph_module, "remove_server", ph_remove_server, 1);
+
 
   /*
-   * Document-method: enable_logging
-   * call-seq: enable_logging(log_level, output_file)
+   * Document-method: enableServer
+   * call-seq: enableServer(server_name)
    *
-   * Enables logging.
+   * Enables attempts to connect to a discovered server, if attempts were previously disabled by PhidgetNet_disableServer(). All servers are enabled by default.
+   * This call will fail if the server was not previously added, disabled or discovered.
    */
-  rb_define_singleton_method(ph_module, "enable_logging", ph_enable_logging, 2);
+  rb_define_singleton_method(ph_module, "enableServer", ph_enable_server, 1);
+  rb_define_singleton_method(ph_module, "enable_server", ph_enable_server, 1);
+
 
   /*
-   * Document-method: disableLogging
-   * call-seq: disableLogging
+   * Document-method: disableServer
+   * call-seq: disableServer(server_name, flags)
    *
-   * Disables logging.
+   * Prevents attempts to automatically connect to a server.
+   * By default the client (your program) will continually attempt to connect to added or discovered servers.This call will disable those attempts, but will not close an already established connection.
    */
-  rb_define_singleton_method(ph_module, "disableLogging", ph_disable_logging, 0);
+  rb_define_singleton_method(ph_module, "disableServer", ph_disable_server, 2);
+  rb_define_singleton_method(ph_module, "disable_server", ph_disable_server, 2);
+
 
   /*
-   * Document-method: disable_logging
-   * call-seq: disable_logging
+   * Document-method: enableServerDiscovery
+   * call-seq: enableServerDiscovery(server_type)
    *
-   * Disables logging.
+   * Enables the dynamic discovery of servers that publish their identity to the network. Currently Multicast DNS is used to discover and publish Phidget servers.
+   * To connect to remote Phidgets, call this function with server type DEVICEREMOTE.
+   * PhidgetNet_enableServerDiscovery() must be called once for each server type your program requires. Multiple calls for the same server type are ignored
+   * This call will fail with the error code EPHIDGET_UNSUPPORTED if your computer does not have the required mDNS support. We recommend using Bonjour Print Services on Windows and Mac, or Avahi on Linux.
    */
-  rb_define_singleton_method(ph_module, "disable_logging", ph_disable_logging, 0);
+  rb_define_singleton_method(ph_module, "enableServerDiscovery", ph_enable_server_discovery, 1);
+  rb_define_singleton_method(ph_module, "enable_server_discovery", ph_enable_server_discovery, 1);
+
 
   /*
-   * Document-method: log
-   * call-seq: log(log_level, msg_id, msg)
+   * Document-method: disableServerDiscovery
+   * call-seq: disableServerDiscovery(server_type)
    *
-   * Appends a message to the log.
+   * Disables the dynamic discovery of servers that publish their identity.
+   * PhidgetNet_disableServerDiscovery() does not disconnect already established connections.
    */
-  rb_define_singleton_method(ph_module, "log", ph_log, 3);
+  rb_define_singleton_method(ph_module, "disableServerDiscovery", ph_disable_server_discovery, 1);
+  rb_define_singleton_method(ph_module, "disable_server_discovery", ph_disable_server_discovery, 1);
 
-  Init_dictionary();
+
+  /*
+   * Document-method: setServerPassword
+   * call-seq: setServerPassword(server_name, password)
+   *
+   * Sets the password that will be used to attempt to connect to the server. If the server has not already been added or discovered, a placeholder server entry
+   * will be registered to use this password on the server once it is discovered.
+   */
+  rb_define_singleton_method(ph_module, "setServerPassword", ph_set_server_password, 2);
+  rb_define_singleton_method(ph_module, "server_password", ph_set_server_password, 2);
+
+
+  Init_logging();
   Init_manager();
   Init_common();
   Init_accelerometer();
-  Init_advanced_servo();
-  Init_analog();
-  Init_bridge();
+  Init_bldc_motor();
+  Init_capacitive_touch();
+  Init_current_input();
+  Init_dc_motor();
+  Init_dictionary();
+  Init_digital_input();
+  Init_digital_output();
+  Init_distance();
   Init_encoder();
   Init_frequency_counter();
   Init_gps();
-  Init_interface_kit();
+  Init_gyroscope();
+  Init_hub();
+  Init_humidity();
   Init_ir();
-  Init_led();
-  Init_motor_control();
+  Init_lcd();
+  Init_light();
+  Init_magnetometer();
+  Init_motor_position_controller();
   Init_ph_sensor();
+  Init_power_guard();
+  Init_pressure();
+  Init_rc_servo();
   Init_rfid();
-  Init_servo();
+  Init_resistance();
+  Init_sound();
   Init_spatial();
   Init_stepper();
   Init_temperature_sensor();
-  Init_text_lcd();
-  Init_text_led();
-  Init_weight_sensor();
+  Init_voltage_input();
+  Init_voltage_output();
+  Init_voltage_ratio_input();
 }
 
 
@@ -210,69 +464,350 @@ ph_data_t *get_ph_data(VALUE self) {
   return ph;
 }
 
-CPhidgetHandle get_ph_handle(VALUE self) {
+PhidgetHandle get_ph_handle(VALUE self) {
   ph_data_t *ph = get_ph_data(self);
   return ph->handle;
 }
 
 void ph_raise(int err_code) {
-  if(err_code > EPHIDGET_OK && err_code < PHIDGET_ERROR_CODE_COUNT) {
-    const char *err_description;
-    CPhidget_getErrorDescription(err_code, &err_description);
-    rb_raise(ph_errors[err_code], err_description);
+  if(err_code != EPHIDGET_OK) {
+    VALUE ph_module = rb_const_get(rb_cObject, rb_intern("Phidgets"));
+    VALUE ph_error = rb_const_get(ph_module, rb_intern("Error"));
+
+    switch( err_code ) {
+      case EPHIDGET_PERM:
+        rb_raise(rb_const_get(ph_error, rb_intern("NotPermitted")), "Not Permitted");
+        break;
+      case EPHIDGET_NOENT:
+        rb_raise(rb_const_get(ph_error, rb_intern("NoSuchEntity")), "No Such Entity");
+        break;
+      case EPHIDGET_TIMEOUT:
+        rb_raise(rb_const_get(ph_error, rb_intern("TimedOut")), "Timed Out");
+        break;
+      case EPHIDGET_KEEPALIVE:
+        rb_raise(rb_const_get(ph_error, rb_intern("KeepAliveFailure")), "Keep Alive Failure");
+        break;
+      case EPHIDGET_INTERRUPTED:
+        rb_raise(rb_const_get(ph_error, rb_intern("OpInterrupted")), "Op Interrupted");
+        break;
+      case EPHIDGET_IO:
+        rb_raise(rb_const_get(ph_error, rb_intern("IOError")), "IO Issue");
+        break;
+      case EPHIDGET_NOMEMORY:
+        rb_raise(rb_const_get(ph_error, rb_intern("MemoryError")), "Memory Issue");
+        break;
+      case EPHIDGET_ACCESS:
+        rb_raise(rb_const_get(ph_error, rb_intern("AccessError")), "Access (Permission) Issue");
+        break;
+      case EPHIDGET_FAULT:
+        rb_raise(rb_const_get(ph_error, rb_intern("AddressError")), "Address Issue");
+        break;
+      case EPHIDGET_BUSY:
+        rb_raise(rb_const_get(ph_error, rb_intern("ResourceBusy")), "Resource Busy");
+        break;
+      case EPHIDGET_EXIST:
+        rb_raise(rb_const_get(ph_error, rb_intern("ObjectExists")), "Object Exists");
+        break;
+      case EPHIDGET_NOTDIR:
+        rb_raise(rb_const_get(ph_error, rb_intern("ObjectNotDirectory")), "Object is not a directory");
+        break;
+      case EPHIDGET_ISDIR:
+        rb_raise(rb_const_get(ph_error, rb_intern("ObjectIsDirectory")), "Object is a directory");
+        break;
+      case EPHIDGET_INVALID:
+        rb_raise(rb_const_get(ph_error, rb_intern("Invalid")), "Invalid");
+        break;
+      case EPHIDGET_NFILE:
+        rb_raise(rb_const_get(ph_error, rb_intern("TooManyOpenFilesInSystem")), "Too many open files in system");
+        break;
+      case EPHIDGET_MFILE:
+        rb_raise(rb_const_get(ph_error, rb_intern("TooManyOpenFiles")), "Too many open files");
+        break;
+      case EPHIDGET_NOSPC:
+        rb_raise(rb_const_get(ph_error, rb_intern("NoSpace")), "Not enough space");
+        break;
+      case EPHIDGET_FBIG:
+        rb_raise(rb_const_get(ph_error, rb_intern("FileTooBig")), "File too Big");
+        break;
+      case EPHIDGET_ROFS:
+        rb_raise(rb_const_get(ph_error, rb_intern("ReadOnlyFilesystem")), "Read Only Filesystem");
+        break;
+      case EPHIDGET_RO:
+        rb_raise(rb_const_get(ph_error, rb_intern("ReadOnlyObject")), "Read Only Object");
+        break;
+      case EPHIDGET_UNSUPPORTED:
+        rb_raise(rb_const_get(ph_error, rb_intern("OpNotSupported")), "Operation Not Supported");
+        break;
+      case EPHIDGET_INVALIDARG:
+        rb_raise(rb_const_get(ph_error, rb_intern("InvalidArg")), "Invalid Argument");
+        break;
+      case EPHIDGET_AGAIN:
+        rb_raise(rb_const_get(ph_error, rb_intern("TryAgain")), "Try again");
+        break;
+      case EPHIDGET_NOTEMPTY:
+        rb_raise(rb_const_get(ph_error, rb_intern("NotEmpty")), "Not Empty");
+        break;
+      case EPHIDGET_UNEXPECTED:
+        rb_raise(rb_const_get(ph_error, rb_intern("UnexpectedError")), "Unexpected Error");
+        break;
+      case EPHIDGET_DUPLICATE:
+        rb_raise(rb_const_get(ph_error, rb_intern("Duplicate")), "Duplicate");
+        break;
+      case EPHIDGET_BADPASSWORD:
+        rb_raise(rb_const_get(ph_error, rb_intern("BadCredential")), "Bad Credential");
+        break;
+      case EPHIDGET_NETUNAVAIL:
+        rb_raise(rb_const_get(ph_error, rb_intern("NetworkUnavailable")), "Network Unavailable");
+        break;
+      case EPHIDGET_CONNREF:
+        rb_raise(rb_const_get(ph_error, rb_intern("ConnectionRefused")), "Connection Refused");
+        break;
+      case EPHIDGET_CONNRESET:
+        rb_raise(rb_const_get(ph_error, rb_intern("ConnectionReset")), "Connection Reset");
+        break;
+      case EPHIDGET_HOSTUNREACH:
+        rb_raise(rb_const_get(ph_error, rb_intern("NoRouteToHost")), "No route to host");
+        break;
+      case EPHIDGET_NODEV:
+        rb_raise(rb_const_get(ph_error, rb_intern("NoSuchDevice")), "No Such Device");
+        break;
+      case EPHIDGET_WRONGDEVICE:
+        rb_raise(rb_const_get(ph_error, rb_intern("WrongDevice")), "Wrong Device");
+        break;
+      case EPHIDGET_PIPE:
+        rb_raise(rb_const_get(ph_error, rb_intern("BrokenPipe")), "Broken Pipe");
+        break;
+      case EPHIDGET_RESOLV:
+        rb_raise(rb_const_get(ph_error, rb_intern("NameResolutionError")), "Name Resolution Failure");
+        break;
+      case EPHIDGET_UNKNOWNVAL:
+        rb_raise(rb_const_get(ph_error, rb_intern("UnknownValue")), "Unknown or Invalid Value");
+        break;
+      case EPHIDGET_NOTATTACHED:
+        rb_raise(rb_const_get(ph_error, rb_intern("DeviceNotAttached")), "Device not Attached");
+        break;
+      case EPHIDGET_INVALIDPACKET:
+        rb_raise(rb_const_get(ph_error, rb_intern("InvalidPacket")), "Invalid or Unexpected Packet");
+        break;
+      case EPHIDGET_2BIG:
+        rb_raise(rb_const_get(ph_error, rb_intern("ArgListTooLong")), "Argument List Too Long");
+        break;
+      case EPHIDGET_BADVERSION:
+        rb_raise(rb_const_get(ph_error, rb_intern("BadVersion")), "Bad Version");
+        break;
+      case EPHIDGET_CLOSED:
+        rb_raise(rb_const_get(ph_error, rb_intern("Closed")), "Closed");
+        break;
+      case EPHIDGET_NOTCONFIGURED:
+        rb_raise(rb_const_get(ph_error, rb_intern("NotConfigured")), "Not Configured");
+        break;
+      case EPHIDGET_EOF:
+        rb_raise(rb_const_get(ph_error, rb_intern("EndOfFile")), "End of File");
+        break;
+      case EPHIDGET_NOTIMPLEMENTED:
+        rb_raise(rb_const_get(ph_error, rb_intern("NotImplemented")), "This functionality has not been implemented yet");
+        break;
+      default:
+        rb_raise(rb_const_get(ph_error, rb_intern("UnknownError")), "Unknown Error");
+    }
   }
-  if(err_code == EPHIDGET_NOTIMPLEMENTED) {
-    rb_raise(ph_errors[EPHIDGET_NOTIMPLEMENTED], "This functionality has not been implemented yet");
+}
+
+
+VALUE ph_get_instance_from_handle(PhidgetHandle ph_handle) {
+  VALUE ph_module = rb_const_get(rb_cModule, rb_intern("Phidgets"));
+  VALUE klass;
+  VALUE argv[0];
+  Phidget_ChannelClass ch_class;
+  Phidget_getChannelClass(ph_handle, &ch_class);
+
+  switch( ch_class ) {
+    case PHIDCHCLASS_ACCELEROMETER:
+      klass = rb_const_get(ph_module, rb_intern("Accelerometer"));
+      break;
+    case PHIDCHCLASS_BLDCMOTOR:
+      klass = rb_const_get(ph_module, rb_intern("BLDCMotor"));
+      break;
+    case PHIDCHCLASS_CAPACITIVETOUCH:
+      klass = rb_const_get(ph_module, rb_intern("CapacitiveTouch"));
+      break;
+    case PHIDCHCLASS_CURRENTINPUT:
+      klass = rb_const_get(ph_module, rb_intern("CurrentInput"));
+      break;
+    case PHIDCHCLASS_DCMOTOR:
+      klass = rb_const_get(ph_module, rb_intern("DCMotor"));
+      break;
+    case PHIDCHCLASS_DIGITALINPUT:
+      klass = rb_const_get(ph_module, rb_intern("DigitalInput"));
+      break;
+    case PHIDCHCLASS_DIGITALOUTPUT:
+      klass = rb_const_get(ph_module, rb_intern("DigitalOutput"));
+      break;
+    case PHIDCHCLASS_DISTANCESENSOR:
+      klass = rb_const_get(ph_module, rb_intern("DistanceSensor"));
+      break;
+    case PHIDCHCLASS_ENCODER:
+      klass = rb_const_get(ph_module, rb_intern("Encoder"));
+      break;
+    case PHIDCHCLASS_FREQUENCYCOUNTER:
+      klass = rb_const_get(ph_module, rb_intern("FrequencyCounter"));
+      break;
+    case PHIDCHCLASS_GPS:
+      klass = rb_const_get(ph_module, rb_intern("GPS"));
+      break;
+    case PHIDCHCLASS_GYROSCOPE:
+      klass = rb_const_get(ph_module, rb_intern("Gyroscope"));
+      break;
+    case PHIDCHCLASS_HUB:
+      klass = rb_const_get(ph_module, rb_intern("Hub"));
+      break;
+    case PHIDCHCLASS_HUMIDITYSENSOR:
+      klass = rb_const_get(ph_module, rb_intern("HumiditySensor"));
+      break;
+    case PHIDCHCLASS_IR:
+      klass = rb_const_get(ph_module, rb_intern("IR"));
+      break;
+    case PHIDCHCLASS_LCD:
+      klass = rb_const_get(ph_module, rb_intern("LCD"));
+      break;
+    case PHIDCHCLASS_LIGHTSENSOR:
+      klass = rb_const_get(ph_module, rb_intern("LightSensor"));
+      break;
+    case PHIDCHCLASS_MAGNETOMETER:
+      klass = rb_const_get(ph_module, rb_intern("Magnetometer"));
+      break;
+    case PHIDCHCLASS_MOTORPOSITIONCONTROLLER:
+      klass = rb_const_get(ph_module, rb_intern("MotorPositionController"));
+      break;
+    case PHIDCHCLASS_PHSENSOR:
+      klass = rb_const_get(ph_module, rb_intern("PHSensor"));
+      break;
+    case PHIDCHCLASS_POWERGUARD:
+      klass = rb_const_get(ph_module, rb_intern("PowerGuard"));
+      break;
+    case PHIDCHCLASS_PRESSURESENSOR:
+      klass = rb_const_get(ph_module, rb_intern("PressureSensor"));
+      break;
+    case PHIDCHCLASS_RCSERVO:
+      klass = rb_const_get(ph_module, rb_intern("RCServo"));
+      break;
+    case PHIDCHCLASS_RESISTANCEINPUT:
+      klass = rb_const_get(ph_module, rb_intern("ResistanceInput"));
+      break;
+    case PHIDCHCLASS_RFID:
+      klass = rb_const_get(ph_module, rb_intern("RFID"));
+      break;
+    case PHIDCHCLASS_SOUNDSENSOR:
+      klass = rb_const_get(ph_module, rb_intern("SoundSensor"));
+      break;
+    case PHIDCHCLASS_SPATIAL:
+      klass = rb_const_get(ph_module, rb_intern("Spatial"));
+      break;
+    case PHIDCHCLASS_STEPPER:
+      klass = rb_const_get(ph_module, rb_intern("Stepper"));
+      break;
+    case PHIDCHCLASS_TEMPERATURESENSOR:
+      klass = rb_const_get(ph_module, rb_intern("TemperatureSensor"));
+      break;
+    case PHIDCHCLASS_VOLTAGEINPUT:
+      klass = rb_const_get(ph_module, rb_intern("VoltageInput"));
+      break;
+    case PHIDCHCLASS_VOLTAGEOUTPUT:
+      klass = rb_const_get(ph_module, rb_intern("VoltageOutput"));
+      break;
+    case PHIDCHCLASS_VOLTAGERATIOINPUT:
+      klass = rb_const_get(ph_module, rb_intern("VoltageRatioInput"));
+      break;
+    case PHIDCHCLASS_DICTIONARY:
+      klass = rb_const_get(ph_module, rb_intern("Dictionary"));
+      break;
+    default:
+      klass = Qnil;
   }
+
+  return rb_class_new_instance(0, argv, klass);
 }
 
-VALUE ph_get_library_version(VALUE self) {
-  const char *lib_version;
-  ph_raise(CPhidget_getLibraryVersion(&lib_version));
-  return rb_str_new2(lib_version);
+
+VALUE ph_get_int(PhidgetHandle handle, PhidgetReturnCode (*func)(PhidgetHandle, int *))
+{
+  int value;
+  ph_raise(func(handle, &value));
+  return INT2NUM(value);
 }
 
-VALUE ph_enable_logging(VALUE self, VALUE level, VALUE output_file) {
-  ph_raise(CPhidget_enableLogging(FIX2INT(level), StringValueCStr(output_file)));
-  return Qnil;
+
+VALUE ph_get_uint(PhidgetHandle handle, PhidgetReturnCode (*func)(PhidgetHandle, uint32_t *))
+{
+  uint32_t value;
+  ph_raise(func(handle, &value));
+  return UINT2NUM(value);
 }
 
-VALUE ph_disable_logging(VALUE self) {
-  ph_raise(CPhidget_disableLogging());
-  return Qnil;
+
+VALUE ph_get_int64(PhidgetHandle handle, PhidgetReturnCode (*func)(PhidgetHandle, int64_t *))
+{
+  int64_t value;
+  ph_raise(func(handle, &value));
+  return LL2NUM(value);
 }
 
-VALUE ph_log(VALUE self, VALUE level, VALUE msg_id, VALUE message) {
-  ph_raise(CPhidget_log(FIX2INT(level), StringValueCStr(msg_id), StringValueCStr(message)));
-  return Qnil;
+
+VALUE ph_get_uint64(PhidgetHandle handle, PhidgetReturnCode (*func)(PhidgetHandle, uint64_t *))
+{
+  uint64_t value;
+  ph_raise(func(handle, &value));
+  return ULL2NUM(value);
+}
+
+
+VALUE ph_get_bool(PhidgetHandle handle, PhidgetReturnCode (*func)(PhidgetHandle, int *))
+{
+  int value;
+  ph_raise(func(handle, &value));
+  return value == PTRUE ? Qtrue : Qfalse;
+}
+
+
+VALUE ph_get_double(PhidgetHandle handle, PhidgetReturnCode (*func)(PhidgetHandle, double *))
+{
+  double value;
+  ph_raise(func(handle, &value));
+  return DBL2NUM(value);
+}
+
+
+VALUE ph_get_string(PhidgetHandle handle, PhidgetReturnCode (*func)(PhidgetHandle, const char **))
+{
+  const char *value;
+  ph_raise(func(handle, &value));
+  if(value == NULL) return Qnil;
+  return rb_str_new2(value);
 }
 
 
-#ifdef PH_CALLBACK
 void ph_callback_thread(ph_callback_data_t *callback_data) {
   while(! callback_data->exit) {
-#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
     rb_thread_call_without_gvl(wait_for_callback, (void *)callback_data, cancel_wait_for_callback, (void *)callback_data);
-#else
-    rb_thread_blocking_region(wait_for_callback, (void *)callback_data, cancel_wait_for_callback, (void *)callback_data);
-#endif
-    if(TYPE(callback_data->callback) != T_NIL) rb_funcall(callback_data->callback, rb_intern("call"), 1, callback_data->phidget);
-    callback_data->called = false;
+    if(TYPE(callback_data->callback) != T_NIL) rb_funcall(callback_data->callback, rb_intern("call"), 5, callback_data->phidget, callback_data->arg1, callback_data->arg2, callback_data->arg3, callback_data->arg4);
   };
 }
 
-ph_callback_return_t wait_for_callback(void *arg) {
+void *wait_for_callback(void *arg) {
   ph_callback_data_t *callback_data = (ph_callback_data_t *)arg;
   while(! callback_data->exit) {
-    usleep(PH_CALLBACK_POLLING_INTERVAL);
-    if(callback_data->called) return (ph_callback_return_t)Qnil;
+    sem_post(&callback_data->handler_ready);
+    while(sem_wait(&callback_data->callback_called)!=0) {};
+    return (void *)Qnil;
   };
-  return (ph_callback_return_t)Qnil;
+  return (void *)Qnil;
 }
 
 void cancel_wait_for_callback(void *arg) {
   ph_callback_data_t *callback_data = (ph_callback_data_t *)arg;
+  callback_data->callback = T_NIL;
   callback_data->exit = true;
+  sem_post(&callback_data->handler_ready);
+  sem_post(&callback_data->callback_called);
 }
-#endif