phidgets4r 0.0.3 → 0.0.5

data/lib/phidgets/common.rb

@@ -1,4 +1,3 @@
-
 require 'dl'
 require 'rbconfig'
 
@@ -164,12 +163,14 @@ module Phidgets
     @@server_status = nil
     @@device_id = nil
     @@device_class = nil
-
+    
     def initialize
       if @@libname == nil
         case Config::CONFIG['target_os']
           when 'linux'
             @@libname = 'libphidget21.so'
+          when 'linux-eabi'
+            @@libname = 'libphidget21.so'
           when 'mswin32'
             @@libname = 'phidget21.dll'
           when 'darwin10.2.0'
@@ -188,7 +189,6 @@ module Phidgets
       end
 
       @handle = DL.malloc(DL.sizeof('P'))
-      
     end
 
     private
@@ -260,6 +260,15 @@ module Phidgets
       arg_ptr.to_s
     end
 
+    def call_IPp(sym_name, func_name, arg1)
+      sym_name = sym(func_name, 'IPp') if sym_name == nil
+      arg_ptr = DL.malloc(DL.sizeof('P'))
+      r,rs = sym_name.call(arg1, arg_ptr.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      arg_ptr.free = nil
+      arg_ptr
+    end
+    
     def createCallback(callback)
       DL.callback('IPP') {|handle,data|
         data = ObjectSpace._id2ref(data.to_i)
@@ -400,7 +409,7 @@ module Phidgets
     def getDeviceClass
       call_IPi(@@device_class, 'CPhidget_getDeviceClass', @handle)
     end
-
+    
   end
 
 end

data/lib/phidgets/interfacekit.rb

@@ -1,6 +1,3 @@
-
-#require 'phidgets/common'
-
 module Phidgets
 
   class InterfaceKit < Common

data/lib/phidgets/manager.rb

@@ -0,0 +1,64 @@
+module Phidgets
+
+  class Manager < Common
+
+    @@create = nil
+    @@open = nil
+    @@close = nil
+    @@delete = nil
+    @@getdevices = nil
+
+    def initialize
+      super()
+
+      @manhandle = DL.malloc(DL.sizeof('P'))
+
+      create
+      open
+
+    end
+
+    def create
+      @@create = sym('CPhidgetManager_create', 'Ip') if @@create == nil
+      r, rs = @@create.call(@manhandle.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+    end
+
+    def open
+      call_IX(@@open, 'CPhidgetManager_open', 'IP', @manhandle)
+    end
+
+    def close
+      call_IX(@@close, 'CPhidgetManager_close', 'IP', @manhandle)
+    end
+
+    def delete
+      call_IX(@@delete, 'CPhidgetManager_delete', 'IP', @manhandle)
+    end
+
+    def setOnDetachHandler(callback, data)
+      call_IXXX(@@detach_handler, 'CPhidgetManager_set_OnDetach_Handler', 'IPPP', @handle, createCallback(callback), DL::PtrData.new(data.object_id))
+    end
+
+    def setOnAttachHandler(callback, data)
+      call_IXXX(@@attach_handler, 'CPhidgetManager_set_OnAttach_Handler', 'IPPP', @handle, createCallback(callback), DL::PtrData.new(data.object_id))
+    end
+
+    def get_attached_devices
+
+      @devices = DL.malloc(DL.sizeof('P'))
+      @numDevices = DL.malloc(DL.sizeof('I'))
+
+      puts "|-   # -|-              Type              -|- Serial No. -|-  Version -|\n"
+      puts "|-------|----------------------------------|--------------|------------|\n"
+      @@getdevices = sym('CPhidgetManager_getAttachedDevices', 'IPPP') if @@getdevices == nil
+      r, rs = @@getdevices.call(@manhandle, @devices.ref, @numDevices.ref)
+      raise Phidgets::Exception.new(r) if r != 0
+      @numDevices.free = nil
+      puts "Num Devices: #{@numDevices.to_i}"
+
+    end
+
+  end
+
+end

data/lib/phidgets/rfid.rb

@@ -1,6 +1,3 @@
-
-#require 'phidgets/common'
-
 module Phidgets
 
   class RFID < Common

data/lib/phidgets/servo.rb

@@ -1,6 +1,3 @@
-
-#require 'phidgets/common'
-
 module Phidgets
 
   class Servo < Common

data/lib/phidgets4r.rb

@@ -5,7 +5,8 @@ require File.dirname(__FILE__) + '/phidgets/common.rb'
 require File.dirname(__FILE__) + '/phidgets/interfacekit.rb'
 require File.dirname(__FILE__) + '/phidgets/rfid.rb'
 require File.dirname(__FILE__) + '/phidgets/servo.rb'
+#require File.dirname(__FILE__) + '/phidgets/manager.rb'
 
 module Phidgets
-  VERSION = '0.0.3'
+  VERSION = '0.0.5'
 end

data/test/test_helper.rb

@@ -1,3 +1,3 @@
 require 'stringio'
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/phidgets'
+require File.dirname(__FILE__) + '/../lib/phidgets4r'

data/test/test_manager.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestPhidgetsManager < Test::Unit::TestCase
+
+  def setup
+    sleep 1
+  end
+  
+  def test_001_display_devices
+    assert_nothing_raised {
+      man = Phidgets::Manager.new
+      devices = man.get_attached_devices
+      sleep 1
+      puts "Sleeping Before Delete!"
+      #man.delete
+    }
+  end
+  
+end

data/test/test_phidgets.rb

@@ -2,4 +2,4 @@
 ## Hopefully we can continue to populate this list
 
 #require File.dirname(__FILE__) + '/test_interfacekit.rb'
-#require File.dirname(__FILE__) + '/test_servo.rb'
+require File.dirname(__FILE__) + '/test_servo.rb'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: phidgets4r
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Kit Plummer
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-16 00:00:00 -07:00
+date: 2010-07-17 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -32,11 +33,13 @@ files:
 - GNU_GPL.txt
 - lib/phidgets/common.rb
 - lib/phidgets/interfacekit.rb
+- lib/phidgets/manager.rb
 - lib/phidgets/rfid.rb
 - lib/phidgets/servo.rb
 - lib/phidgets4r.rb
 - test/test_helper.rb
 - test/test_interfacekit.rb
+- test/test_manager.rb
 - test/test_phidgets.rb
 - test/test_servo.rb
 has_rdoc: true
@@ -49,23 +52,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - none
 rubyforge_project: phidgets4r
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Interact with Phidgets via Ruby.