phidgets-ffi 0.0.5 → 0.1.0

data/lib/phidgets-ffi/error.rb

@@ -1,11 +1,16 @@
 module Phidgets
   module Error
     @errors = {}
+	
     Phidgets::FFI::ErrorCodes.to_hash.each_pair do |sym, num|
-      eval "@errors[num] = (#{sym.to_s.split("_").map(&:capitalize).join} = Class.new(Exception))"
+	  eval "@errors[num] = (#{sym.to_s.split("_").map(&:capitalize).join} = Class.new(Exception))"
     end
-    def self.exception_for(error_code)
-      @errors[error_code]
+    
+	# Returns the error description corresponding to the error code, or raises an error.
+	# @param [Integer] error_code error code
+	# @return [String] the error description, or raises an error.
+	def self.exception_for(error_code)
+		@errors[error_code]
     end
   end
 end

data/lib/phidgets-ffi/ffi/accelerometer.rb

@@ -0,0 +1,30 @@
+module Phidgets
+  module FFI
+  
+    attach_function :CPhidgetAccelerometer_create, [:phid], :int
+	attach_function :CPhidgetAccelerometer_getAxisCount, [:phid, :pointer], :int 
+ 	attach_function :CPhidgetAccelerometer_getAcceleration, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetAccelerometer_getAccelerationMax, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetAccelerometer_getAccelerationMin, [:phid, :int, :pointer], :int     
+	attach_function :CPhidgetAccelerometer_getAccelerationChangeTrigger, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetAccelerometer_setAccelerationChangeTrigger, [:phid, :int, :double], :int 
+	
+    callback :CPhidgetAccelerometer_set_OnAccelerationChange_Callback, [:phid, :user_ptr, :int, :double], :int	
+	attach_function :CPhidgetAccelerometer_set_OnAccelerationChange_Handler, [:phid, :CPhidgetAccelerometer_set_OnAccelerationChange_Callback, :user_ptr], :int
+
+    module CPhidgetAccelerometer
+      def self.method_missing(method, *args, &block)
+        if ::Phidgets::FFI.respond_to?("CPhidgetAccelerometer_#{method}".to_sym)
+          if (rs = ::Phidgets::FFI.send("CPhidgetAccelerometer_#{method}".to_sym, *args, &block)) != 0
+            raise Phidgets::Error.exception_for(rs), Phidgets::FFI.error_description(rs)
+          end
+        else
+          super(method, *args, &block)
+        end
+      end
+    end
+  end
+end
+
+
+

data/lib/phidgets-ffi/ffi/advanced_servo.rb

@@ -0,0 +1,73 @@
+module Phidgets
+  module FFI
+    
+	AdvancedServoType = enum(
+      :default, 1,
+      :raw_us_mode,
+      :hitec_hs322hd,
+      :hitec_hS5245mg,
+      :hitec_805bb,
+      :hitec_hs422,
+      :towerpro_mg90,
+      :hitec_hsr1425cr,
+      :hitec_hs785hb,
+      :hitec_hs485hb,
+      :hitec_hs645mg,
+      :hitec_815bb,
+      :firgelli_l12_30_50_06_r,
+      :firgelli_l12_50_100_06_r,
+      :firgelli_l12_50_210_06_r,
+      :firgelli_l12_100_50_06_r,
+      :firgelli_l12_100_100_06_r,
+      :user_defined
+    )
+
+	attach_function :CPhidgetAdvancedServo_create, [:phid], :int 
+    attach_function :CPhidgetAdvancedServo_getMotorCount, [:phid, :pointer], :int 
+    attach_function :CPhidgetAdvancedServo_getAcceleration, [:phid, :int, :pointer], :int 
+    attach_function :CPhidgetAdvancedServo_setAcceleration, [:phid, :int, :double], :int 
+    attach_function :CPhidgetAdvancedServo_getAccelerationMax, [:phid, :int, :pointer], :int 
+    attach_function :CPhidgetAdvancedServo_getAccelerationMin, [:phid, :int, :pointer], :int 
+    attach_function :CPhidgetAdvancedServo_getVelocityLimit, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetAdvancedServo_setVelocityLimit, [:phid, :int, :double], :int 
+	attach_function :CPhidgetAdvancedServo_getVelocity, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetAdvancedServo_getVelocityMax, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetAdvancedServo_getVelocityMin, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetAdvancedServo_getPosition, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetAdvancedServo_setPosition, [:phid, :int, :double], :int 
+	attach_function :CPhidgetAdvancedServo_getPositionMax, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetAdvancedServo_setPositionMax, [:phid, :int, :double], :int 
+	attach_function :CPhidgetAdvancedServo_getPositionMin, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetAdvancedServo_setPositionMin, [:phid, :int, :double], :int 
+	attach_function :CPhidgetAdvancedServo_getCurrent, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetAdvancedServo_getSpeedRampingOn, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetAdvancedServo_setSpeedRampingOn, [:phid, :int, :int], :int 
+	attach_function :CPhidgetAdvancedServo_getEngaged, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetAdvancedServo_setEngaged, [:phid, :int, :int], :int 
+	attach_function :CPhidgetAdvancedServo_getStopped, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetAdvancedServo_getServoType, [:phid, :int, :pointer], :int  
+	attach_function :CPhidgetAdvancedServo_setServoType, [:phid, :int, AdvancedServoType], :int  
+	attach_function :CPhidgetAdvancedServo_setServoParameters, [:phid, :int, :double, :double, :double, :double], :int  
+	
+	callback :CPhidgetAdvancedServo_set_OnVelocityChange_Callback, [:phid, :user_ptr, :int, :double], :int
+    attach_function :CPhidgetAdvancedServo_set_OnVelocityChange_Handler, [:phid, :CPhidgetAdvancedServo_set_OnVelocityChange_Callback, :user_ptr], :int
+	
+	callback :CPhidgetAdvancedServo_set_OnPositionChange_Callback, [:phid, :user_ptr, :int, :double], :int
+    attach_function :CPhidgetAdvancedServo_set_OnPositionChange_Handler, [:phid, :CPhidgetAdvancedServo_set_OnPositionChange_Callback, :user_ptr], :int 
+	
+	callback :CPhidgetAdvancedServo_set_OnCurrentChange_Callback, [:phid, :user_ptr, :int, :double], :int
+    attach_function :CPhidgetAdvancedServo_set_OnCurrentChange_Handler, [:phid, :CPhidgetAdvancedServo_set_OnCurrentChange_Callback, :user_ptr], :int 
+	
+    module CPhidgetAdvancedServo
+      def self.method_missing(method, *args, &block)
+        if ::Phidgets::FFI.respond_to?("CPhidgetAdvancedServo_#{method}".to_sym)
+          if (rs = ::Phidgets::FFI.send("CPhidgetAdvancedServo_#{method}".to_sym, *args, &block)) != 0
+            raise Phidgets::Error.exception_for(rs), Phidgets::FFI.error_description(rs)
+          end
+        else
+          super(method, *args, &block)
+        end
+      end
+    end
+  end
+end

data/lib/phidgets-ffi/ffi/analog.rb

@@ -0,0 +1,29 @@
+module Phidgets
+  module FFI
+  
+    attach_function :CPhidgetAnalog_create, [:phid], :int
+	attach_function :CPhidgetAnalog_getOutputCount, [:phid, :pointer], :int 
+	attach_function :CPhidgetAnalog_getVoltage, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetAnalog_setVoltage, [:phid, :int, :double], :int 
+	attach_function :CPhidgetAnalog_getVoltageMax, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetAnalog_getVoltageMin, [:phid, :int, :pointer], :int     
+	attach_function :CPhidgetAnalog_getEnabled, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetAnalog_setEnabled, [:phid, :int, :int], :int 
+
+	module CPhidgetAnalog
+      def self.method_missing(method, *args, &block)
+        if ::Phidgets::FFI.respond_to?("CPhidgetAnalog_#{method}".to_sym)
+          if (rs = ::Phidgets::FFI.send("CPhidgetAnalog_#{method}".to_sym, *args, &block)) != 0
+         
+		    raise Phidgets::Error.exception_for(rs), Phidgets::FFI.error_description(rs)
+          end
+        else
+          super(method, *args, &block)
+        end
+      end
+    end 
+  end
+end
+
+
+

data/lib/phidgets-ffi/ffi/bridge.rb

@@ -0,0 +1,44 @@
+module Phidgets
+  module FFI
+
+   BridgeGains = enum(
+      :gain_1, 1,
+      :gain_8,
+      :gain_16,
+      :gain_32,
+      :gain_64,
+      :gain_128,
+      :gain_unknown
+    )
+
+	attach_function :CPhidgetBridge_create, [:phid], :int
+    attach_function :CPhidgetBridge_getInputCount, [:phid, :pointer], :int 
+    attach_function :CPhidgetBridge_getBridgeValue, [:phid, :int, :pointer], :int 
+    attach_function :CPhidgetBridge_getBridgeMax, [:phid, :int, :pointer], :int 
+    attach_function :CPhidgetBridge_getBridgeMin, [:phid, :int, :pointer], :int 
+    attach_function :CPhidgetBridge_setEnabled, [:phid, :int, :int], :int 
+    attach_function :CPhidgetBridge_getEnabled, [:phid, :int, :pointer], :int 
+    attach_function :CPhidgetBridge_getGain, [:phid, :int, :pointer], :int 
+    attach_function :CPhidgetBridge_setGain, [:phid, :int, BridgeGains], :int 
+    attach_function :CPhidgetBridge_getDataRate, [:phid, :pointer], :int 
+    attach_function :CPhidgetBridge_setDataRate, [:phid, :int], :int 
+    attach_function :CPhidgetBridge_getDataRateMax, [:phid, :pointer], :int 
+    attach_function :CPhidgetBridge_getDataRateMin, [:phid, :pointer], :int 
+    attach_function :CPhidgetBridge_getBridgeValue, [:phid, :int, :pointer], :int 
+
+    callback :CPhidgetBridge_set_OnBridgeData_Callback, [:phid, :user_ptr, :int, :double], :int
+    attach_function :CPhidgetBridge_set_OnBridgeData_Handler, [:phid, :CPhidgetBridge_set_OnBridgeData_Callback, :user_ptr], :int 
+ 
+module CPhidgetBridge
+      def self.method_missing(method, *args, &block)
+        if ::Phidgets::FFI.respond_to?("CPhidgetBridge_#{method}".to_sym)
+          if (rs = ::Phidgets::FFI.send("CPhidgetBridge_#{method}".to_sym, *args, &block)) != 0
+            raise Phidgets::Error.exception_for(rs), Phidgets::FFI.error_description(rs)
+          end
+        else
+          super(method, *args, &block)
+        end
+      end
+    end
+  end
+end

data/lib/phidgets-ffi/ffi/common.rb

@@ -1,45 +1,62 @@
 module Phidgets
   module FFI
     class Error < Exception; end
-    attach_function :CPhidget_open, [:phid, :int], :int #int CPhidget_open(CPhidgetHandle phid, int serialNumber);
-    attach_function :CPhidget_openLabel, [:phid, :string], :int #int CPhidget_openLabel(CPhidgetHandle phid, const char *label);
-    attach_function :CPhidget_close, [:phid], :int #int CPhidget_close(CPhidgetHandle phid);
-    attach_function :CPhidget_delete, [:phid], :int #int CPhidget_delete(CPhidgetHandle phid);
-    callback :CPhidget_set_OnDetach_Callback, [:phid, :user_ptr], :int
-    attach_function :CPhidget_set_OnDetach_Handler, [:phid, :CPhidget_set_OnDetach_Callback, :user_ptr], :int #int CPhidget_set_OnDetach_Handler(CPhidgetHandle phid, int( *fptr)(CPhidgetHandle phid, void *userPtr), void *userPtr);
-    callback :CPhidget_set_OnAttach_Callback, [:phid, :user_ptr], :int
-    attach_function :CPhidget_set_OnAttach_Handler, [:phid, :CPhidget_set_OnAttach_Callback, :user_ptr], :int #int CPhidget_set_OnAttach_Handler(CPhidgetHandle phid, int( *fptr)(CPhidgetHandle phid, void *userPtr), void *userPtr);
-    callback :CPhidget_set_OnServerConnect_Callback, [:phid, :user_ptr], :int
-    attach_function :CPhidget_set_OnServerConnect_Handler, [:phid, :CPhidget_set_OnServerConnect_Callback, :user_ptr], :int #int CPhidget_set_OnServerConnect_Handler(CPhidgetHandle phid, int ( *fptr)(CPhidgetHandle phid, void *userPtr), void *userPtr);
-    callback :CPhidget_set_OnServerDisconnect_Callback, [:phid, :user_ptr], :int
-    attach_function :CPhidget_set_OnServerDisconnect_Handler, [:phid, :CPhidget_set_OnServerDisconnect_Callback, :user_ptr], :int #int CPhidget_set_OnServerDisconnect_Handler(CPhidgetHandle phid, int ( *fptr)(CPhidgetHandle phid, void *userPtr), void *userPtr);
-    callback :CPhidget_set_OnError_Callback, [:phid, :user_ptr, :int, :string], :int
-    attach_function :CPhidget_set_OnError_Handler, [:phid, :CPhidget_set_OnError_Callback, :user_ptr], :int #int CPhidget_set_OnError_Handler(CPhidgetHandle phid, int( *fptr)(CPhidgetHandle phid, void *userPtr, int errorCode, const char *errorString), void *userPtr);
-    attach_function :CPhidget_getDeviceName, [:phid, :pointer], :int #int CPhidget_getDeviceName(CPhidgetHandle phid, const char **deviceName);
-    attach_function :CPhidget_getSerialNumber, [:phid, :pointer], :int #int CPhidget_getSerialNumber(CPhidgetHandle phid, int *serialNumber);
-    attach_function :CPhidget_getDeviceVersion, [:phid, :pointer], :int #int CPhidget_getDeviceVersion(CPhidgetHandle phid, int *deviceVersion);
-    attach_function :CPhidget_getDeviceStatus, [:phid, :pointer], :int #int CPhidget_getDeviceStatus(CPhidgetHandle phid, int *deviceStatus);
+    
+	attach_function :CPhidget_open, [:phid, :int], :int
+    attach_function :CPhidget_openRemote, [:phid, :int, :string, :string], :int
+	attach_function :CPhidget_openRemoteIP, [:phid, :int, :string, :int, :string], :int
+	attach_function :CPhidget_openLabelRemote, [:phid, :string, :string, :string], :int
+	attach_function :CPhidget_openLabelRemoteIP, [:phid, :string, :string, :int, :string], :int
+	attach_function :CPhidget_openLabel, [:phid, :string], :int
+    attach_function :CPhidget_close, [:phid], :int 
+    attach_function :CPhidget_delete, [:phid], :int 
+	attach_function :CPhidget_getDeviceName, [:phid, :pointer], :int 
+    attach_function :CPhidget_getSerialNumber, [:phid, :pointer], :int 
+    attach_function :CPhidget_getDeviceVersion, [:phid, :pointer], :int 
+    attach_function :CPhidget_getDeviceStatus, [:phid, :pointer], :int 
     attach_function :CPhidget_getLibraryVersion, [:pointer], :int
-    attach_function :CPhidget_getDeviceType, [:phid, :pointer], :int #int CPhidget_getDeviceType(CPhidgetHandle phid, const char **deviceType);
-    attach_function :CPhidget_getDeviceLabel, [:phid, :pointer], :int #int CPhidget_getDeviceLabel(CPhidgetHandle phid, const char **deviceLabel);
-    attach_function :CPhidget_setDeviceLabel, [:phid, :string], :int #int CPhidget_setDeviceLabel(CPhidgetHandle phid, const char *deviceLabel);
-    attach_function :CPhidget_getErrorDescription, [:int, :pointer], :int #int CPhidget_getErrorDescription(int errorCode, const char **errorString);
-    attach_function :CPhidget_waitForAttachment, [:phid, :int], :int #int CPhidget_waitForAttachment(CPhidgetHandle phid, int milliseconds);
-    attach_function :CPhidget_getServerID, [:phid, :pointer], :int #int CPhidget_getServerID(CPhidgetHandle phid, const char **serverID);
-    attach_function :CPhidget_getServerAddress, [:phid, :pointer, :pointer], :int #int CPhidget_getServerAddress(CPhidgetHandle phid, const char **address, int *port);
-    attach_function :CPhidget_getServerStatus, [:phid, :pointer], :int #int CPhidget_getServerStatus(CPhidgetHandle phid, int *serverStatus);
-    attach_function :CPhidget_getDeviceID, [:phid, :pointer], :int #int CPhidget_getDeviceID(CPhidgetHandle phid, CPhidget_DeviceID *deviceID);
-    attach_function :CPhidget_getDeviceClass, [:phid, :pointer], :int #int CPhidget_getDeviceClass(CPhidgetHandle phid, CPhidget_DeviceClass *deviceClass);
-    callback :CPhidget_set_OnWillSleep_Callback, [:user_ptr], :int
-    attach_function :CPhidget_set_OnWillSleep_Handler, [:CPhidget_set_OnWillSleep_Callback, :user_ptr], :int #int CPhidget_set_OnWillSleep_Handler(int( *fptr)(void *userPtr), void *userPtr);
-    callback :CPhidget_set_OnWakeup_Callback, [:user_ptr], :int
-    attach_function :CPhidget_set_OnWakeup_Handler, [:CPhidget_set_OnWakeup_Callback, :user_ptr], :int #int CPhidget_set_OnWakeup_Handler(int( *fptr)(void *userPtr), void *userPtr);
+    attach_function :CPhidget_getDeviceType, [:phid, :pointer], :int 
+    attach_function :CPhidget_getDeviceLabel, [:phid, :pointer], :int 
+    attach_function :CPhidget_setDeviceLabel, [:phid, :string], :int 
+    attach_function :CPhidget_getErrorDescription, [:int, :pointer], :int
+    
+	@blocking = true
+	attach_function :CPhidget_waitForAttachment, [:phid, :int], :int, :blocking => true  
+    
+	attach_function :CPhidget_getServerID, [:phid, :pointer], :int 
+    attach_function :CPhidget_getServerAddress, [:phid, :pointer, :pointer], :int 
+    attach_function :CPhidget_getServerStatus, [:phid, :pointer], :int 
+    attach_function :CPhidget_getDeviceID, [:phid, :pointer], :int 
+    attach_function :CPhidget_getDeviceClass, [:phid, :pointer], :int 
+    
+	callback :CPhidget_set_OnDetach_Callback, [:phid, :user_ptr], :int
+	attach_function :CPhidget_set_OnDetach_Handler, [:phid, :CPhidget_set_OnDetach_Callback, :user_ptr], :int
+    
+	callback :CPhidget_set_OnAttach_Callback, [:phid, :user_ptr], :int
+	attach_function :CPhidget_set_OnAttach_Handler, [:phid, :CPhidget_set_OnAttach_Callback, :user_ptr], :int
+    
+	callback :CPhidget_set_OnServerConnect_Callback, [:phid, :user_ptr], :int
+    attach_function :CPhidget_set_OnServerConnect_Handler, [:phid, :CPhidget_set_OnServerConnect_Callback, :user_ptr], :int
+    
+	callback :CPhidget_set_OnServerDisconnect_Callback, [:phid, :user_ptr], :int
+    attach_function :CPhidget_set_OnServerDisconnect_Handler, [:phid, :CPhidget_set_OnServerDisconnect_Callback, :user_ptr], :int
+    
+	callback :CPhidget_set_OnError_Callback, [:phid, :user_ptr, :int, :string], :int
+    attach_function :CPhidget_set_OnError_Handler, [:phid, :CPhidget_set_OnError_Callback, :user_ptr], :int
+    
 
+	if Config::CONFIG['target_os'] =~ /darwin/ #Mac OS X
+		callback :CPhidget_set_OnWillSleep_Callback, [:user_ptr], :int
+		attach_function :CPhidget_set_OnWillSleep_Handler, [:CPhidget_set_OnWillSleep_Callback, :user_ptr], :int
+		callback :CPhidget_set_OnWakeup_Callback, [:user_ptr], :int
+		attach_function :CPhidget_set_OnWakeup_Handler, [:CPhidget_set_OnWakeup_Callback, :user_ptr], :int 
+	end
+	
     module Common
       def self.method_missing(method, *args, &block)
         if ::Phidgets::FFI.respond_to?("CPhidget_#{method}".to_sym)
-          if (rs = ::Phidgets::FFI.send("CPhidget_#{method}".to_sym, *args, &block)) != 0
-            raise Phidgets::Error.exception_for(rs), Phidgets::FFI.error_description(rs)
+			if (rs = ::Phidgets::FFI.send("CPhidget_#{method}".to_sym, *args, &block)) != 0
+			raise Phidgets::Error.exception_for(rs), Phidgets::FFI.error_description(rs)
           end
         else
           super(method, *args, &block)

data/lib/phidgets-ffi/ffi/constants.rb

@@ -1,5 +1,6 @@
 module Phidgets
   module FFI
+
     typedef :pointer, :phid
     typedef :pointer, :user_ptr
         
@@ -65,7 +66,7 @@ module Phidgets
       :spatial_accel_gyro_compass, 0x033,
       :temperature_sensor, 0x070,
       :temperature_sensor_4, 0x032,
-      :sensor_ir, 0x03C,
+	  :temperature_sensor_ir, 0x03C,
       :textlcd_2x20_w_8_8_8, 0x17D,
       :textlcd_adapter, 0x03D,
       :unipolar_stepper_4motor, 0x07A,
@@ -110,5 +111,6 @@ module Phidgets
       :bad_version,
       :error_code_count
     )
+	
   end
 end

data/lib/phidgets-ffi/ffi/dictionary.rb

@@ -9,27 +9,32 @@ module Phidgets
       :unchanged
     )
 
-    attach_function :CPhidgetDictionary_create, [:dict], :int #int CPhidgetDictionary_create(CPhidgetDictionaryHandle *dict);
-    attach_function :CPhidgetDictionary_openRemote, [:dict, :string, :string], :int #int CPhidgetDictionary_openRemote(CPhidgetDictionaryHandle dict, const char *serverID, const char *password);
-    attach_function :CPhidgetDictionary_openRemoteIP, [:dict, :string, :int, :string], :int #int CPhidgetDictionary_openRemoteIP(CPhidgetDictionaryHandle dict, const char *address, int port, const char *password);
-    attach_function :CPhidgetDictionary_close, [:dict], :int #int CPhidgetDictionary_close(CPhidgetDictionaryHandle dict);
-    attach_function :CPhidgetDictionary_delete, [:dict], :int #int CPhidgetDictionary_delete(CPhidgetDictionaryHandle dict);
+    attach_function :CPhidgetDictionary_create, [:dict], :int 
+    attach_function :CPhidgetDictionary_openRemote, [:dict, :string, :string], :int 
+    attach_function :CPhidgetDictionary_openRemoteIP, [:dict, :string, :int, :string], :int 
+    attach_function :CPhidgetDictionary_close, [:dict], :int 
+    attach_function :CPhidgetDictionary_delete, [:dict], :int 
+    attach_function :CPhidgetDictionary_addKey, [:dict, :string, :string, :int], :int
+    attach_function :CPhidgetDictionary_removeKey, [:dict, :string], :int 
+    attach_function :CPhidgetDictionary_getKey, [:dict, :string, :pointer, :int], :int
+    attach_function :CPhidgetDictionary_getServerID, [:dict, :pointer], :int 
+    attach_function :CPhidgetDictionary_getServerAddress, [:dict, :pointer, :pointer], :int
+    attach_function :CPhidgetDictionary_getServerStatus, [:dict, :pointer], :int 
+    
     callback :CPhidgetDictionary_set_OnError_Callback, [:dict, :pointer, :int, :string], :int
-    attach_function :CPhidgetDictionary_set_OnError_Handler, [:dict, :CPhidgetDictionary_set_OnError_Callback, :pointer], :int #int CPhidgetDictionary_set_OnError_Handler(CPhidgetDictionaryHandle dict, int( *fptr)(CPhidgetDictionaryHandle, void *userPtr, int errorCode, const char *errorString), void *userPtr);
-    attach_function :CPhidgetDictionary_addKey, [:dict, :string, :string, :int], :int #int CPhidgetDictionary_addKey(CPhidgetDictionaryHandle dict, const char *key, const char *value, int persistent);
-    attach_function :CPhidgetDictionary_removeKey, [:dict, :string], :int #int CPhidgetDictionary_removeKey(CPhidgetDictionaryHandle dict, const char *pattern);
-    attach_function :CPhidgetDictionary_getKey, [:dict, :string, :pointer, :int], :int #int CPhidgetDictionary_getKey(CPhidgetDictionaryHandle dict, const char *key, char *value, int valuelen);
-    callback :CPhidgetDictionary_set_OnServerConnect_Callback, [:dict, :pointer], :int
-    attach_function :CPhidgetDictionary_set_OnServerConnect_Handler, [:dict, :CPhidgetDictionary_set_OnServerConnect_Callback, :pointer], :int #int CPhidgetDictionary_set_OnServerConnect_Handler(CPhidgetDictionaryHandle dict, int ( *fptr)(CPhidgetDictionaryHandle dict, void *userPtr), void *userPtr);
-    callback :CPhidgetDictionary_set_OnServerDisconnect_Callback, [:dict, :pointer], :int
-    attach_function :CPhidgetDictionary_set_OnServerDisconnect_Handler, [:dict, :CPhidgetDictionary_set_OnServerDisconnect_Callback, :pointer], :int #int CPhidgetDictionary_set_OnServerDisconnect_Handler(CPhidgetDictionaryHandle dict, int ( *fptr)(CPhidgetDictionaryHandle dict, void *userPtr), void *userPtr);
-    attach_function :CPhidgetDictionary_getServerID, [:dict, :pointer], :int #int CPhidgetDictionary_getServerID(CPhidgetDictionaryHandle dict, const char **serverID);
-    attach_function :CPhidgetDictionary_getServerAddress, [:dict, :pointer, :pointer], :int #int CPhidgetDictionary_getServerAddress(CPhidgetDictionaryHandle dict, const char **address, int *port);
-    attach_function :CPhidgetDictionary_getServerStatus, [:dict, :pointer], :int #int CPhidgetDictionary_getServerStatus(CPhidgetDictionaryHandle dict, int *serverStatus);
-    callback :CPhidgetDictionary_set_OnKeyChange_Callback, [:dict, :pointer, :string, :string, KeyChangeReason], :int
-    attach_function :CPhidgetDictionary_set_OnKeyChange_Handler, [:dict, :pointer, :string, :CPhidgetDictionary_set_OnKeyChange_Callback, :pointer], :int #int CPhidgetDictionary_set_OnKeyChange_Handler(CPhidgetDictionaryHandle dict, CPhidgetDictionaryListenerHandle *dictlistener, const char *pattern, CPhidgetDictionary_OnKeyChange_Function fptr, void *userPtr);
-    attach_function :CPhidgetDictionary_remove_OnKeyChange_Handler, [:dict], :int #int CPhidgetDictionary_remove_OnKeyChange_Handler(CPhidgetDictionaryListenerHandle dictlistener);
-     
+    attach_function :CPhidgetDictionary_set_OnError_Handler, [:dict, :CPhidgetDictionary_set_OnError_Callback, :pointer], :int 
+	
+	callback :CPhidgetDictionary_set_OnServerConnect_Callback, [:dict, :pointer], :int
+    attach_function :CPhidgetDictionary_set_OnServerConnect_Handler, [:dict, :CPhidgetDictionary_set_OnServerConnect_Callback, :pointer], :int
+	
+	callback :CPhidgetDictionary_set_OnServerDisconnect_Callback, [:dict, :pointer], :int
+    attach_function :CPhidgetDictionary_set_OnServerDisconnect_Handler, [:dict, :CPhidgetDictionary_set_OnServerDisconnect_Callback, :pointer], :int 
+	
+	callback :CPhidgetDictionary_set_OnKeyChange_Callback, [:dict, :pointer, :string, :string, KeyChangeReason], :int
+    attach_function :CPhidgetDictionary_set_OnKeyChange_Handler, [:dict, :pointer, :string, :CPhidgetDictionary_set_OnKeyChange_Callback, :pointer], :int
+	
+	attach_function :CPhidgetDictionary_remove_OnKeyChange_Handler, [:dict], :int
+	
     module CPhidgetDictionary
       def self.method_missing(method, *args, &block)
         if ::Phidgets::FFI.respond_to?("CPhidgetDictionary_#{method}".to_sym)

data/lib/phidgets-ffi/ffi/encoder.rb

@@ -0,0 +1,32 @@
+module Phidgets
+  module FFI
+
+	attach_function :CPhidgetEncoder_create, [:phid], :int
+    attach_function :CPhidgetEncoder_getInputCount, [:phid, :pointer], :int 
+    attach_function :CPhidgetEncoder_getInputState, [:phid, :int, :pointer], :int 
+    attach_function :CPhidgetEncoder_getEncoderCount, [:phid, :pointer], :int 
+	attach_function :CPhidgetEncoder_getPosition, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetEncoder_setPosition, [:phid, :int, :int], :int 
+    attach_function :CPhidgetEncoder_getIndexPosition, [:phid, :int, :pointer], :int 
+    attach_function :CPhidgetEncoder_getEnabled, [:phid, :int, :pointer], :int 
+    attach_function :CPhidgetEncoder_setEnabled, [:phid, :int, :int], :int 
+
+	callback :CPhidgetEncoder_set_OnInputChange_Callback, [:phid, :user_ptr, :int, :int], :int
+    attach_function :CPhidgetEncoder_set_OnInputChange_Handler, [:phid, :CPhidgetEncoder_set_OnInputChange_Callback, :user_ptr], :int 
+	
+    callback :CPhidgetEncoder_set_OnPositionChange_Callback, [:phid, :user_ptr, :int, :int, :int], :int
+    attach_function :CPhidgetEncoder_set_OnPositionChange_Handler, [:phid, :CPhidgetEncoder_set_OnPositionChange_Callback, :user_ptr], :int 
+
+module CPhidgetEncoder
+      def self.method_missing(method, *args, &block)
+        if ::Phidgets::FFI.respond_to?("CPhidgetEncoder_#{method}".to_sym)
+          if (rs = ::Phidgets::FFI.send("CPhidgetEncoder_#{method}".to_sym, *args, &block)) != 0
+            raise Phidgets::Error.exception_for(rs), Phidgets::FFI.error_description(rs)
+          end
+        else
+          super(method, *args, &block)
+        end
+      end
+    end
+  end
+end

data/lib/phidgets-ffi/ffi/frequency_counter.rb

@@ -0,0 +1,38 @@
+module Phidgets
+  module FFI
+
+   FrequencyCounterFilterTypes = enum(
+      :filter_type_zero_crossing, 1,
+      :filter_type_logic_level,
+      :filter_type_unknown
+    )
+
+	attach_function :CPhidgetFrequencyCounter_create, [:phid], :int
+    attach_function :CPhidgetFrequencyCounter_getFrequencyInputCount, [:phid, :pointer], :int 
+    attach_function :CPhidgetFrequencyCounter_getFrequency, [:phid, :int, :pointer], :int 
+    attach_function :CPhidgetFrequencyCounter_getTotalTime, [:phid, :int, :pointer], :int 	
+	attach_function :CPhidgetFrequencyCounter_getTotalCount, [:phid, :int, :pointer], :int 	
+	attach_function :CPhidgetFrequencyCounter_setTimeout, [:phid, :int, :int], :int 
+	attach_function :CPhidgetFrequencyCounter_getTimeout, [:phid, :int, :pointer], :int 
+	attach_function :CPhidgetFrequencyCounter_setEnabled, [:phid, :int, :int], :int 
+    attach_function :CPhidgetFrequencyCounter_getEnabled, [:phid, :int, :pointer], :int 
+    attach_function :CPhidgetFrequencyCounter_getFilter, [:phid, :int, :pointer], :int 
+    attach_function :CPhidgetFrequencyCounter_setFilter, [:phid, :int, FrequencyCounterFilterTypes], :int 
+	attach_function :CPhidgetFrequencyCounter_reset, [:phid, :int], :int 
+    
+    callback :CPhidgetFrequencyCounter_set_OnCount_Callback, [:phid, :user_ptr, :int, :int, :int], :int
+    attach_function :CPhidgetFrequencyCounter_set_OnCount_Handler, [:phid, :CPhidgetFrequencyCounter_set_OnCount_Callback, :user_ptr], :int 
+ 
+module CPhidgetFrequencyCounter
+      def self.method_missing(method, *args, &block)
+        if ::Phidgets::FFI.respond_to?("CPhidgetFrequencyCounter_#{method}".to_sym)
+          if (rs = ::Phidgets::FFI.send("CPhidgetFrequencyCounter_#{method}".to_sym, *args, &block)) != 0
+            raise Phidgets::Error.exception_for(rs), Phidgets::FFI.error_description(rs)
+          end
+        else
+          super(method, *args, &block)
+        end
+      end
+    end
+  end
+end