phidgets 0.1.3 → 1.0.0

data/ext/phidgets/phidgets_magnetometer.c

@@ -0,0 +1,279 @@
+
+#include "phidgets.h"
+
+#define MAGNETOMETER_MAGNETIC_FIELD_CHANGE_CALLBACK    0
+
+
+VALUE ph_magnetometer_init(VALUE self) {
+  ph_data_t *ph = get_ph_data(self);
+  ph_raise(PhidgetMagnetometer_create((PhidgetMagnetometerHandle *)(&(ph->handle))));
+  return self;
+}
+
+VALUE ph_magnetometer_get_axis_count(VALUE self) {
+  return ph_get_int(get_ph_handle(self), (phidget_get_int_func)PhidgetMagnetometer_getAxisCount);
+}
+
+VALUE ph_magnetometer_set_correction_parameters(VALUE self, VALUE mag_field, VALUE offset0, VALUE offset1, VALUE offset2, VALUE gain0, VALUE gain1, VALUE gain2, VALUE T0, VALUE T1, VALUE T2, VALUE T3, VALUE T4, VALUE T5) {
+  ph_raise(PhidgetMagnetometer_setCorrectionParameters((PhidgetMagnetometerHandle)get_ph_handle(self), NUM2DBL(mag_field), NUM2DBL(offset0), NUM2DBL(offset1), NUM2DBL(offset2),
+      NUM2DBL(gain0), NUM2DBL(gain1), NUM2DBL(gain2), NUM2DBL(T0), NUM2DBL(T1), NUM2DBL(T2), NUM2DBL(T3), NUM2DBL(T4), NUM2DBL(T5)));
+  return Qnil;
+}
+
+VALUE ph_magnetometer_get_data_interval(VALUE self) {
+  return ph_get_uint(get_ph_handle(self), (phidget_get_uint_func)PhidgetMagnetometer_getDataInterval);
+}
+
+VALUE ph_magnetometer_set_data_interval(VALUE self, VALUE interval) {
+  ph_raise(PhidgetMagnetometer_setDataInterval((PhidgetMagnetometerHandle)get_ph_handle(self), NUM2UINT(interval)));
+  return Qnil;
+}
+
+VALUE ph_magnetometer_get_min_data_interval(VALUE self) {
+  return ph_get_uint(get_ph_handle(self), (phidget_get_uint_func)PhidgetMagnetometer_getMinDataInterval);
+}
+
+VALUE ph_magnetometer_get_max_data_interval(VALUE self) {
+  return ph_get_uint(get_ph_handle(self), (phidget_get_uint_func)PhidgetMagnetometer_getMaxDataInterval);
+}
+
+VALUE ph_magnetometer_get_magnetic_field(VALUE self) {
+  double mag_field[3];
+  ph_raise(PhidgetMagnetometer_getMagneticField((PhidgetMagnetometerHandle)get_ph_handle(self), &mag_field));
+  return rb_ary_new3(3, DBL2NUM(mag_field[0]), DBL2NUM(mag_field[1]), DBL2NUM(mag_field[2]));
+}
+
+VALUE ph_magnetometer_get_min_magnetic_field(VALUE self) {
+  double mag_field[3];
+  ph_raise(PhidgetMagnetometer_getMinMagneticField((PhidgetMagnetometerHandle)get_ph_handle(self), &mag_field));
+  return rb_ary_new3(3, DBL2NUM(mag_field[0]), DBL2NUM(mag_field[1]), DBL2NUM(mag_field[2]));
+}
+
+VALUE ph_magnetometer_get_max_magnetic_field(VALUE self) {
+  double mag_field[3];
+  ph_raise(PhidgetMagnetometer_getMaxMagneticField((PhidgetMagnetometerHandle)get_ph_handle(self), &mag_field));
+  return rb_ary_new3(3, DBL2NUM(mag_field[0]), DBL2NUM(mag_field[1]), DBL2NUM(mag_field[2]));
+}
+
+VALUE ph_magnetometer_get_magnetic_field_change_trigger(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetMagnetometer_getMagneticFieldChangeTrigger);
+}
+
+VALUE ph_magnetometer_set_magnetic_field_change_trigger(VALUE self, VALUE change_trigger) {
+  ph_raise(PhidgetMagnetometer_setMagneticFieldChangeTrigger((PhidgetMagnetometerHandle)get_ph_handle(self), NUM2DBL(change_trigger)));
+  return Qnil;
+}
+
+VALUE ph_magnetometer_get_min_magnetic_field_change_trigger(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetMagnetometer_getMinMagneticFieldChangeTrigger);
+}
+
+VALUE ph_magnetometer_get_max_magnetic_field_change_trigger(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetMagnetometer_getMaxMagneticFieldChangeTrigger);
+}
+
+VALUE ph_magnetometer_reset_correction_parameters(VALUE self) {
+  ph_raise(PhidgetMagnetometer_resetCorrectionParameters((PhidgetMagnetometerHandle)get_ph_handle(self)));
+  return Qnil;
+}
+
+VALUE ph_magnetometer_save_correction_parameters(VALUE self) {
+  ph_raise(PhidgetMagnetometer_saveCorrectionParameters((PhidgetMagnetometerHandle)get_ph_handle(self)));
+  return Qnil;
+}
+
+VALUE ph_magnetometer_get_timestamp(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetMagnetometer_getTimestamp);
+}
+
+
+void CCONV ph_magnetometer_on_magnetic_field_change(PhidgetMagnetometerHandle phid, void *userPtr, const double mag_field[3], double timestamp) {
+  ph_callback_data_t *callback_data = ((ph_callback_data_t *)userPtr);
+  while(sem_wait(&callback_data->handler_ready)!=0) {};
+  callback_data->arg1 = rb_ary_new3(3, DBL2NUM(mag_field[0]), DBL2NUM(mag_field[1]), DBL2NUM(mag_field[2]));
+  callback_data->arg2 = DBL2NUM(timestamp);
+  callback_data->arg3 = Qnil;
+  callback_data->arg4 = Qnil;
+  sem_post(&callback_data->callback_called);
+}
+
+
+VALUE ph_magnetometer_set_on_magnetic_field_change_handler(VALUE self, VALUE handler) {
+  ph_data_t *ph = get_ph_data(self);
+  ph_callback_data_t *callback_data = &ph->dev_callbacks[MAGNETOMETER_MAGNETIC_FIELD_CHANGE_CALLBACK];
+  if( TYPE(handler) == T_NIL ) {
+    callback_data->callback = T_NIL;
+    callback_data->exit = true;
+    ph_raise(PhidgetMagnetometer_setOnMagneticFieldChangeHandler((PhidgetMagnetometerHandle)ph->handle, NULL, (void *)NULL));
+    sem_post(&callback_data->callback_called);
+  } else {
+    callback_data->exit = false;
+    callback_data->phidget = self;
+    callback_data->callback = handler;
+    ph_raise(PhidgetMagnetometer_setOnMagneticFieldChangeHandler((PhidgetMagnetometerHandle)ph->handle, ph_magnetometer_on_magnetic_field_change, (void *)callback_data));
+    ph_callback_thread(callback_data);
+  }
+  return Qnil;
+}
+
+
+void Init_magnetometer() {
+  VALUE ph_module = rb_const_get(rb_cObject, rb_intern("Phidgets"));
+  VALUE ph_common = rb_const_get(ph_module, rb_intern("Common"));
+  VALUE ph_magnetometer = rb_define_class_under(ph_module, "Magnetometer", ph_common);
+
+  /* Document-method: new
+   * call-seq: new
+   *
+   * Creates a Phidget Magnetometer object.
+   */
+  rb_define_method(ph_magnetometer, "initialize", ph_magnetometer_init, 0);
+
+  /* Document-method: getAxisCount
+   * call-seq: getAxisCount -> axis_count
+   *
+   * The number of axes the channel can measure field strength on.
+   * See your device's User Guide for more information about the number of axes and their orientation.
+   */
+  rb_define_method(ph_magnetometer, "getAxisCount", ph_magnetometer_get_axis_count, 0);
+  rb_define_alias(ph_magnetometer, "axis_count", "getAxisCount");
+
+  /* Document-method: setCorrectionParameters
+   * call-seq: setCorrectionParameters(mag_field, offset0, offset1, offset2, gain0, gain1, gain2, T0, T1, T2, T3, T4, T5)
+   *
+   * Calibrate your device for the environment it will be used in.
+   * Due to physical location, hard and soft iron offsets, and even bias errors, your device should be calibrated.
+   * We have created a calibration program that will provide you with the CompassCorrectionParameters for your specific situation.
+   * See your device's User Guide for more information.
+   */
+  rb_define_method(ph_magnetometer, "setCorrectionParameters", ph_magnetometer_set_correction_parameters, 13);
+  rb_define_alias(ph_magnetometer, "set_correction_parameters", "setCorrectionParameters");
+
+  /* Document-method: getDataInterval
+   * call-seq: getDataInterval -> interval
+   *
+   * The DataInterval is the time that must elapse before the channel will fire another IlluminanceChange event.
+   * The data interval is bounded by MinDataInterval and MaxDataInterval.
+   * The timing between IlluminanceChange events can also affected by the IlluminanceChangeTrigger.
+   */
+  rb_define_method(ph_magnetometer, "getDataInterval", ph_magnetometer_get_data_interval, 0);
+  rb_define_alias(ph_magnetometer, "data_interval", "getDataInterval");
+
+  /* Document-method: setDataInterval
+   * call-seq: setDataInterval(interval)
+   *
+   * The DataInterval is the time that must elapse before the channel will fire another IlluminanceChange event.
+   * The data interval is bounded by MinDataInterval and MaxDataInterval.
+   * The timing between IlluminanceChange events can also affected by the IlluminanceChangeTrigger.
+   */
+  rb_define_method(ph_magnetometer, "setDataInterval", ph_magnetometer_set_data_interval, 1);
+  rb_define_alias(ph_magnetometer, "data_interval=", "setDataInterval");
+
+  /* Document-method: getMinDataInterval
+   * call-seq: getMinDataInterval -> interval
+   *
+   * The minimum value that DataInterval can be set to.
+   */
+  rb_define_method(ph_magnetometer, "getMinDataInterval", ph_magnetometer_get_min_data_interval, 0);
+  rb_define_alias(ph_magnetometer, "min_data_interval", "getMinDataInterval");
+
+  /* Document-method: getMaxDataInterval
+   * call-seq: getMaxDataInterval -> interval
+   *
+   * The maximum value that DataInterval can be set to.
+   */
+  rb_define_method(ph_magnetometer, "getMaxDataInterval", ph_magnetometer_get_max_data_interval, 0);
+  rb_define_alias(ph_magnetometer, "max_data_interval", "getMaxDataInterval");
+
+  /* Document-method: getMagneticField
+   * call-seq: getMagneticField -> magnetic_field
+   *
+   * The most recent field strength value that the channel has reported.
+   * This value will always be between MinMagneticField and MaxMagneticField.
+   */
+  rb_define_method(ph_magnetometer, "getMagneticField", ph_magnetometer_get_magnetic_field, 0);
+  rb_define_alias(ph_magnetometer, "magnetic_field", "getMagneticField");
+
+  /* Document-method: getMinMagneticField
+   * call-seq: getMinMagneticField -> magnetic_field
+   *
+   * The minimum value that the MagneticFieldChange event will report.
+   */
+  rb_define_method(ph_magnetometer, "getMinMagneticField", ph_magnetometer_get_min_magnetic_field, 0);
+  rb_define_alias(ph_magnetometer, "min_magnetic_field", "getMinMagneticField");
+
+  /* Document-method: getMaxMagneticField
+   * call-seq: getMaxMagneticField -> magnetic_field
+   *
+   * The maximum value that the MagneticFieldChange event will report.
+   */
+  rb_define_method(ph_magnetometer, "getMaxMagneticField", ph_magnetometer_get_max_magnetic_field, 0);
+  rb_define_alias(ph_magnetometer, "max_magnetic_field", "getMaxMagneticField");
+
+  /* Document-method: getMagneticFieldChangeTrigger
+   * call-seq: getMagneticFieldChangeTrigger -> change_trigger
+   *
+   * The channel will not issue a MagneticFieldChange event until the field strength value has changed by the amount specified by the MagneticFieldChangeTrigger.
+   * Setting the MagneticFieldChangeTrigger to 0 will result in the channel firing events every DataInterval. This is useful for applications that implement their own data filtering.
+   */
+  rb_define_method(ph_magnetometer, "getMagneticFieldChangeTrigger", ph_magnetometer_get_magnetic_field_change_trigger, 0);
+  rb_define_alias(ph_magnetometer, "magnetic_field_change_trigger", "getMagneticFieldChangeTrigger");
+
+  /* Document-method: setMagneticFieldChangeTrigger
+   * call-seq: setMagneticFieldChangeTrigger(change_trigger)
+   *
+   * The channel will not issue a MagneticFieldChange event until the field strength value has changed by the amount specified by the MagneticFieldChangeTrigger.
+   * Setting the MagneticFieldChangeTrigger to 0 will result in the channel firing events every DataInterval. This is useful for applications that implement their own data filtering.
+   */
+  rb_define_method(ph_magnetometer, "setMagneticFieldChangeTrigger", ph_magnetometer_set_magnetic_field_change_trigger, 1);
+  rb_define_alias(ph_magnetometer, "magnetic_field_change_trigger=", "setMagneticFieldChangeTrigger");
+
+  /* Document-method: getMinMagneticFieldChangeTrigger
+   * call-seq: getMinMagneticFieldChangeTrigger -> change_trigger
+   *
+   * The minimum value that MagneticFieldChangeTrigger can be set to.
+   */
+  rb_define_method(ph_magnetometer, "getMinMagneticFieldChangeTrigger", ph_magnetometer_get_min_magnetic_field_change_trigger, 0);
+  rb_define_alias(ph_magnetometer, "min_magnetic_field_change_trigger", "getMinMagneticFieldChangeTrigger");
+
+  /* Document-method: getMaxMagneticFieldChangeTrigger
+   * call-seq: getMaxMagneticFieldChangeTrigger -> change_trigger
+   *
+   * The maximum value that MagneticFieldChangeTrigger can be set to.
+   */
+  rb_define_method(ph_magnetometer, "getMaxMagneticFieldChangeTrigger", ph_magnetometer_get_max_magnetic_field_change_trigger, 0);
+  rb_define_alias(ph_magnetometer, "max_magnetic_field_change_trigger", "getMaxMagneticFieldChangeTrigger");
+
+  /* Document-method: resetCorrectionParameters
+   * call-seq: resetCorrectionParameters
+   *
+   * Resets the CompassCorrectionParameters to their default values.
+   * Due to physical location, hard and soft iron offsets, and even bias errors, your device should be calibrated.
+   * We have created a calibration program that will provide you with the CompassCorrectionParameters for your specific situation. See your device's User Guide for more information.
+   */
+  rb_define_method(ph_magnetometer, "resetCorrectionParameters", ph_magnetometer_reset_correction_parameters, 0);
+  rb_define_alias(ph_magnetometer, "reset_correction_parameters", "resetCorrectionParameters");
+
+  /* Document-method: saveCorrectionParameters
+   * call-seq: saveCorrectionParameters
+   *
+   * Saves the CalibrationParameters.
+   * Due to physical location, hard and soft iron offsets, and even bias errors, your device should be calibrated.
+   * We have created a calibration program that will provide you with the CompassCorrectionParameters for your specific situation. See your device's User Guide for more information.
+   */
+  rb_define_method(ph_magnetometer, "saveCorrectionParameters", ph_magnetometer_save_correction_parameters, 0);
+  rb_define_alias(ph_magnetometer, "save_correction_parameters", "saveCorrectionParameters");
+
+  /* Document-method: getTimestamp
+   * call-seq: getTimestamp -> timestamp
+   *
+   * The most recent timestamp value that the channel has reported. This is an extremely accurate time measurement streamed from the device.
+   * If your application requires a time measurement, you should use this value over a local software timestamp.
+   */
+  rb_define_method(ph_magnetometer, "getTimestamp", ph_magnetometer_get_timestamp, 0);
+  rb_define_alias(ph_magnetometer, "timestamp", "getTimestamp");
+
+
+  rb_define_private_method(ph_magnetometer, "ext_setOnMagneticFieldChangeHandler", ph_magnetometer_set_on_magnetic_field_change_handler, 1);
+}
+

data/ext/phidgets/phidgets_manager.c

@@ -2,364 +2,153 @@
 #include "phidgets.h"
 
 
-VALUE ph_manager_allocate(VALUE klass);
-void  ph_manager_free(ph_data_t *ph);
-VALUE ph_manager_init(VALUE self);
-VALUE ph_manager_open(VALUE self);
-VALUE ph_manager_open_remote(VALUE self, VALUE server_id, VALUE password);
-VALUE ph_manager_open_remote_ip(VALUE self, VALUE address, VALUE port, VALUE password);
-VALUE ph_manager_close(VALUE self);
-VALUE ph_manager_get_server_id(VALUE self);
-VALUE ph_manager_get_server_address(VALUE self);
-VALUE ph_manager_get_server_status(VALUE self);
-VALUE ph_manager_get_attached_devices(VALUE self);
-VALUE ph_manager_instance_from_class(CPhidget_DeviceClass dev_class);
-
-#ifdef PH_CALLBACK
-VALUE ph_manager_set_on_attach_handler(VALUE self, VALUE handler);
-VALUE ph_manager_set_on_detach_handler(VALUE self, VALUE handler);
-VALUE ph_manager_set_on_server_connect_handler(VALUE self, VALUE handler);
-VALUE ph_manager_set_on_server_disconnect_handler(VALUE self, VALUE handler);
-int ph_manager_on_attach(CPhidgetHandle phid, void *userPtr);
-int ph_manager_on_detach(CPhidgetHandle phid, void *userPtr);
-int ph_manager_on_server_connect(CPhidgetManagerHandle phid, void *userPtr);
-int ph_manager_on_server_disconnect(CPhidgetManagerHandle phid, void *userPtr);
-#endif
-
-
-void Init_manager() {
-  VALUE ph_module = rb_const_get(rb_cObject, rb_intern("Phidgets"));
-  VALUE ph_manager = rb_define_class_under(ph_module, "Manager", rb_cObject);
-  rb_define_alloc_func(ph_manager, ph_manager_allocate);
-
-  /* Document-method: new
-   * call-seq: new
-   *
-   * Creates a Phidget Manager object.
-   */
-  rb_define_method(ph_manager, "initialize", ph_manager_init, 0);
-  rb_define_private_method(ph_manager, "ext_open", ph_manager_open, 0);
-
-  /* Document-method: openRemote
-   * call-seq: openRemote(server_id, password)
-   *
-   * Opens a Phidget manager remotely by ServerID. Note that this requires Bonjour
-   * (mDNS) to be running on both the host and the server.
-   */
-  rb_define_method(ph_manager, "openRemote", ph_manager_open_remote, 2);
-
-  /* Document-method: openRemoteIP
-   * call-seq: openRemoteIP(address, port, password)
-   *
-   * Opens a Phidget manager remotely by address and port.
-   */
-  rb_define_method(ph_manager, "openRemoteIP", ph_manager_open_remote_ip, 3);
-
-  /* Document-method: close
-   * call-seq: close
-   *
-   * Closes a Phidget Manager.
-   */
-  rb_define_method(ph_manager, "close", ph_manager_close, 0);
-
-  /* Document-method: getServerID
-   * call-seq: getServerID -> server_id
-   *
-   * Gets the server ID of a remotely opened Phidget Manager. This will fail if the manager was opened locally.
-   */
-  rb_define_method(ph_manager, "getServerID", ph_manager_get_server_id, 0);
-
-  /* Document-method: getServerAddress
-   * call-seq: getServerAddress -> [address, port]
-   *
-   * Gets the address and port of a remotely opened Phidget Manager. This will fail if the manager was opened locally.
-   */
-  rb_define_method(ph_manager, "getServerAddress", ph_manager_get_server_address, 0);
-
-  /* Document-method: getServerStatus
-   * call-seq: getServerStatus -> status
-   *
-   * Gets the connected to server status of a remotely opened Phidget Manager. This will fail if the manager was opened locally.
-   */
-  rb_define_method(ph_manager, "getServerStatus", ph_manager_get_server_status, 0);
-
-  /* Document-method: getAttachedDevices
-   * call-seq: getAttachedDevices -> [devices]
-   *
-   * Gets an array of all currently attached Phidgets.
-   */
-  rb_define_method(ph_manager, "getAttachedDevices", ph_manager_get_attached_devices, 0);
-
-#ifdef PH_CALLBACK
-  rb_define_private_method(ph_manager, "ext_setOnAttachHandler", ph_manager_set_on_attach_handler, 1);
-  rb_define_private_method(ph_manager, "ext_setOnDetachHandler", ph_manager_set_on_detach_handler, 1);
-  rb_define_private_method(ph_manager, "ext_setOnServerConnectHandler", ph_manager_set_on_server_connect_handler, 1);
-  rb_define_private_method(ph_manager, "ext_setOnServerDisconnectHandler", ph_manager_set_on_server_disconnect_handler, 1);
-#endif
-
-  rb_define_alias(ph_manager, "open_remote", "openRemote");
-  rb_define_alias(ph_manager, "open_remote_ip", "openRemoteIP");
-  rb_define_alias(ph_manager, "server_id", "getServerID");
-  rb_define_alias(ph_manager, "server_address", "getServerAddress");
-  rb_define_alias(ph_manager, "server_status", "getServerStatus");
-  rb_define_alias(ph_manager, "attached_devices", "getAttachedDevices");
+void ph_manager_free(ph_data_t *ph) {
+  if (ph && ph->handle) {
+    PhidgetManager_close((PhidgetManagerHandle)ph->handle);
+    PhidgetManager_delete((PhidgetManagerHandle *)(&(ph->handle)));
+    ph->handle = NULL;
+  }
+  if(ph) {
+    sem_destroy(&ph->attach_callback.handler_ready);
+    sem_destroy(&ph->attach_callback.callback_called);
+    sem_destroy(&ph->detach_callback.handler_ready);
+    sem_destroy(&ph->detach_callback.callback_called);
+    xfree(ph);
+  }
 }
 
 
-
 VALUE ph_manager_allocate(VALUE klass) {
   ph_data_t *ph;
   VALUE self = Data_Make_Struct(klass, ph_data_t, 0, ph_manager_free, ph);
   memset(ph, 0, sizeof(ph_data_t));
+  sem_init(&ph->attach_callback.handler_ready, 0, 0);
+  sem_init(&ph->attach_callback.callback_called, 0, 0);
+  sem_init(&ph->detach_callback.handler_ready, 0, 0);
+  sem_init(&ph->detach_callback.callback_called, 0, 0);
   return self;
 }
 
-void ph_manager_free(ph_data_t *ph) {
-  if (ph && ph->handle) {
-    CPhidgetManager_close((CPhidgetManagerHandle)ph->handle);
-    CPhidgetManager_delete((CPhidgetManagerHandle)ph->handle);
-    ph->handle = NULL;
-  }
-  if(ph) xfree(ph);
-}
-
 VALUE ph_manager_init(VALUE self) {
   ph_data_t *ph = get_ph_data(self);
-  ph_raise(CPhidgetManager_create((CPhidgetManagerHandle *)(&(ph->handle))));
+  ph_raise(PhidgetManager_create((PhidgetManagerHandle *)(&(ph->handle))));
   return self;
 }
 
 VALUE ph_manager_open(VALUE self) {
-  CPhidgetManagerHandle handle = (CPhidgetManagerHandle)get_ph_handle(self);
-  ph_raise(CPhidgetManager_open(handle));
-  return Qnil;
-}
-
-VALUE ph_manager_open_remote(VALUE self, VALUE server_id, VALUE password) {
-  CPhidgetManagerHandle handle = (CPhidgetManagerHandle)get_ph_handle(self);
-  ph_raise(CPhidgetManager_openRemote(handle, StringValueCStr(server_id), StringValueCStr(password)));
-  return Qnil;
-}
-
-VALUE ph_manager_open_remote_ip(VALUE self, VALUE address, VALUE port, VALUE password) {
-  CPhidgetManagerHandle handle = (CPhidgetManagerHandle)get_ph_handle(self);
-  ph_raise(CPhidgetManager_openRemoteIP(handle, StringValueCStr(address), FIX2INT(port), StringValueCStr(password)));
+  ph_raise(PhidgetManager_open((PhidgetManagerHandle)get_ph_handle(self)));
   return Qnil;
 }
 
 VALUE ph_manager_close(VALUE self) {
-  CPhidgetManagerHandle handle = (CPhidgetManagerHandle)get_ph_handle(self);
-  ph_raise(CPhidgetManager_close(handle));
+  ph_raise(PhidgetManager_close((PhidgetManagerHandle)get_ph_handle(self)));
   return Qnil;
 }
 
-VALUE ph_manager_get_server_id(VALUE self) {
-  CPhidgetManagerHandle handle = (CPhidgetManagerHandle)get_ph_handle(self);
-  const char *server_id;
-  ph_raise(CPhidgetManager_getServerID(handle, &server_id));
-  return rb_str_new2(server_id);
-}
-
-VALUE ph_manager_get_server_address(VALUE self) {
-  CPhidgetManagerHandle handle = (CPhidgetManagerHandle)get_ph_handle(self);
-  const char *address;
-  int port;
-  ph_raise(CPhidgetManager_getServerAddress(handle, &address, &port));
-  return rb_ary_new3(2, rb_str_new2(address), INT2FIX(port));
-}
 
-VALUE ph_manager_get_server_status(VALUE self) {
-  CPhidgetManagerHandle handle = (CPhidgetManagerHandle)get_ph_handle(self);
-  int server_status;
-  ph_raise(CPhidgetManager_getServerStatus(handle, &server_status));
-  return INT2FIX(server_status);
-}
-
-VALUE ph_manager_get_attached_devices(VALUE self) {
-  CPhidgetManagerHandle handle = (CPhidgetManagerHandle)get_ph_handle(self);
-  CPhidgetHandle *devices;
-  int count, i;
-  VALUE rb_hash = rb_hash_new();
-  ph_raise(CPhidgetManager_getAttachedDevices(handle, &devices, &count));
-  for(i=0; i<count; i++) {
-    int serial;
-    CPhidget_DeviceClass dev_class;
-    ph_raise(CPhidget_getSerialNumber(devices[i], &serial));
-    ph_raise(CPhidget_getDeviceClass(devices[i], &dev_class));
-    rb_hash_aset(rb_hash, INT2FIX(serial), ph_manager_instance_from_class(dev_class));
-  }
-  ph_raise(CPhidgetManager_freeAttachedDevicesArray(devices));
-  return rb_hash;
+void CCONV ph_manager_on_attach(PhidgetManagerHandle phid, void *userPtr, PhidgetHandle channel) {
+  ph_callback_data_t *callback_data = ((ph_callback_data_t *)userPtr);
+  int32_t device_serial_number;
+  int hub_port;
+  int channel_index;
+  const char *channel_name;
+  Phidget_getDeviceSerialNumber(channel, &device_serial_number);
+  Phidget_getHubPort(channel, &hub_port);
+  Phidget_getChannel(channel, &channel_index);
+  Phidget_getChannelName(channel, &channel_name);
+  while(sem_wait(&callback_data->handler_ready)!=0) {};
+  callback_data->arg1 = INT2NUM(device_serial_number);
+  callback_data->arg2 = INT2NUM(hub_port);
+  callback_data->arg3 = INT2NUM(channel_index);
+  callback_data->arg4 = rb_str_new2(channel_name);
+  sem_post(&callback_data->callback_called);
 }
 
-VALUE ph_manager_instance_from_class(CPhidget_DeviceClass dev_class) {
-  VALUE ph_module = rb_const_get(rb_cModule, rb_intern("Phidgets"));
-  VALUE klass;
-  VALUE argv[0];
-
-  switch( dev_class ) {
-    case PHIDCLASS_ACCELEROMETER:
-      klass = rb_const_get(ph_module, rb_intern("Accelerometer"));
-      break;
-    case PHIDCLASS_ADVANCEDSERVO:
-      klass = rb_const_get(ph_module, rb_intern("AdvancedServo"));
-      break;
-    case PHIDCLASS_ANALOG:
-      klass = rb_const_get(ph_module, rb_intern("Analog"));
-      break;
-    case PHIDCLASS_BRIDGE:
-      klass = rb_const_get(ph_module, rb_intern("Bridge"));
-      break;
-    case PHIDCLASS_ENCODER:
-      klass = rb_const_get(ph_module, rb_intern("Encoder"));
-      break;
-    case PHIDCLASS_FREQUENCYCOUNTER:
-      klass = rb_const_get(ph_module, rb_intern("FrequencyCounter"));
-      break;
-    case PHIDCLASS_GPS:
-      klass = rb_const_get(ph_module, rb_intern("GPS"));
-      break;
-    case PHIDCLASS_INTERFACEKIT:
-      klass = rb_const_get(ph_module, rb_intern("InterfaceKit"));
-      break;
-    case PHIDCLASS_IR:
-      klass = rb_const_get(ph_module, rb_intern("IR"));
-      break;
-    case PHIDCLASS_LED:
-      klass = rb_const_get(ph_module, rb_intern("LED"));
-      break;
-    case PHIDCLASS_MOTORCONTROL:
-      klass = rb_const_get(ph_module, rb_intern("MotorControl"));
-      break;
-    case PHIDCLASS_PHSENSOR:
-      klass = rb_const_get(ph_module, rb_intern("PhSensor"));
-      break;
-    case PHIDCLASS_RFID:
-      klass = rb_const_get(ph_module, rb_intern("RFID"));
-      break;
-    case PHIDCLASS_SERVO:
-      klass = rb_const_get(ph_module, rb_intern("Servo"));
-      break;
-    case PHIDCLASS_SPATIAL:
-      klass = rb_const_get(ph_module, rb_intern("Spatial"));
-      break;
-    case PHIDCLASS_STEPPER:
-      klass = rb_const_get(ph_module, rb_intern("Stepper"));
-      break;
-    case PHIDCLASS_TEMPERATURESENSOR:
-      klass = rb_const_get(ph_module, rb_intern("TemperatureSensor"));
-      break;
-    case PHIDCLASS_TEXTLCD:
-      klass = rb_const_get(ph_module, rb_intern("TextLCD"));
-      break;
-    case PHIDCLASS_TEXTLED:
-      klass = rb_const_get(ph_module, rb_intern("TextLED"));
-      break;
-    case PHIDCLASS_WEIGHTSENSOR:
-      klass = rb_const_get(ph_module, rb_intern("WeightSensor"));
-      break;
-    default:
-      klass = Qnil;
-  }
-
-  return rb_class_new_instance(0, argv, klass);
-}
 
-#ifdef PH_CALLBACK
 VALUE ph_manager_set_on_attach_handler(VALUE self, VALUE handler) {
   ph_data_t *ph = get_ph_data(self);
   ph_callback_data_t *callback_data = &ph->attach_callback;
   if( TYPE(handler) == T_NIL ) {
+    callback_data->callback = T_NIL;
     callback_data->exit = true;
-    ph_raise(CPhidgetManager_set_OnAttach_Handler((CPhidgetManagerHandle)ph->handle, NULL, (void *)NULL));
+    ph_raise(PhidgetManager_setOnAttachHandler((PhidgetManagerHandle)ph->handle, NULL, (void *)NULL));
+    sem_post(&callback_data->callback_called);
   } else {
-    callback_data->called = false;
     callback_data->exit = false;
     callback_data->phidget = self;
     callback_data->callback = handler;
-    ph_raise(CPhidgetManager_set_OnAttach_Handler((CPhidgetManagerHandle)ph->handle, ph_manager_on_attach, (void *)callback_data));
+    ph_raise(PhidgetManager_setOnAttachHandler((PhidgetManagerHandle)ph->handle, ph_manager_on_attach, (void *)callback_data));
     ph_callback_thread(callback_data);
   }
   return Qnil;
 }
 
-VALUE ph_manager_set_on_detach_handler(VALUE self, VALUE handler) {
-  ph_data_t *ph = get_ph_data(self);
-  ph_callback_data_t *callback_data = &ph->detach_callback;
-  if( TYPE(handler) == T_NIL ) {
-    callback_data->exit = true;
-    ph_raise(CPhidgetManager_set_OnDetach_Handler((CPhidgetManagerHandle)ph->handle, NULL, (void *)NULL));
-  } else {
-    callback_data->called = false;
-    callback_data->exit = false;
-    callback_data->phidget = self;
-    callback_data->callback = handler;
-    ph_raise(CPhidgetManager_set_OnDetach_Handler((CPhidgetManagerHandle)ph->handle, ph_manager_on_detach, (void *)callback_data));
-    ph_callback_thread(callback_data);
-  }
-  return Qnil;
-}
 
-VALUE ph_manager_set_on_server_connect_handler(VALUE self, VALUE handler) {
-  ph_data_t *ph = get_ph_data(self);
-  ph_callback_data_t *callback_data = &ph->server_connect_callback;
-  if( TYPE(handler) == T_NIL ) {
-    callback_data->exit = true;
-    ph_raise(CPhidgetManager_set_OnServerConnect_Handler((CPhidgetManagerHandle)ph->handle, NULL, (void *)NULL));
-  } else {
-    callback_data->called = false;
-    callback_data->exit = false;
-    callback_data->phidget = self;
-    callback_data->callback = handler;
-    ph_raise(CPhidgetManager_set_OnServerConnect_Handler((CPhidgetManagerHandle)ph->handle, ph_manager_on_server_connect, (void *)callback_data));
-    ph_callback_thread(callback_data);
-  }
-  return Qnil;
+void CCONV ph_manager_on_detach(PhidgetManagerHandle phid, void *userPtr, PhidgetHandle channel) {
+  ph_callback_data_t *callback_data = ((ph_callback_data_t *)userPtr);
+  int32_t device_serial_number;
+  Phidget_ChannelClass channel_class;
+  int channel_index;
+  Phidget_getDeviceSerialNumber(channel, &device_serial_number);
+  Phidget_getChannelClass(channel, &channel_class);
+  Phidget_getChannel(channel, &channel_index);
+  while(sem_wait(&callback_data->handler_ready)!=0) {};
+  callback_data->arg1 = INT2NUM(device_serial_number);
+  callback_data->arg2 = INT2NUM(channel_class);
+  callback_data->arg3 = INT2NUM(channel_index);
+  callback_data->arg4 = Qnil;
+  sem_post(&callback_data->callback_called);
 }
 
-VALUE ph_manager_set_on_server_disconnect_handler(VALUE self, VALUE handler) {
+
+VALUE ph_manager_set_on_detach_handler(VALUE self, VALUE handler) {
   ph_data_t *ph = get_ph_data(self);
-  ph_callback_data_t *callback_data = &ph->server_disconnect_callback;
+  ph_callback_data_t *callback_data = &ph->detach_callback;
   if( TYPE(handler) == T_NIL ) {
+    callback_data->callback = T_NIL;
     callback_data->exit = true;
-    ph_raise(CPhidgetManager_set_OnServerDisconnect_Handler((CPhidgetManagerHandle)ph->handle, NULL, (void *)NULL));
+    ph_raise(PhidgetManager_setOnDetachHandler((PhidgetManagerHandle)ph->handle, NULL, (void *)NULL));
+    sem_post(&callback_data->callback_called);
   } else {
-    callback_data->called = false;
     callback_data->exit = false;
     callback_data->phidget = self;
     callback_data->callback = handler;
-    ph_raise(CPhidgetManager_set_OnServerDisconnect_Handler((CPhidgetManagerHandle)ph->handle, ph_manager_on_server_disconnect, (void *)callback_data));
+    ph_raise(PhidgetManager_setOnDetachHandler((PhidgetManagerHandle)ph->handle, ph_manager_on_detach, (void *)callback_data));
     ph_callback_thread(callback_data);
   }
   return Qnil;
 }
 
 
-int ph_manager_on_attach(CPhidgetHandle phid, void *userPtr) {
-  ph_callback_data_t *callback_data = ((ph_callback_data_t *)userPtr);
-  callback_data->called = true;
-  return EPHIDGET_OK;
-}
 
+void Init_manager() {
+  VALUE ph_module = rb_const_get(rb_cObject, rb_intern("Phidgets"));
+  VALUE ph_manager = rb_define_class_under(ph_module, "Manager", rb_cObject);
+  rb_define_alloc_func(ph_manager, ph_manager_allocate);
 
-int ph_manager_on_detach(CPhidgetHandle phid, void *userPtr) {
-  ph_callback_data_t *callback_data = ((ph_callback_data_t *)userPtr);
-  callback_data->called = true;
-  return EPHIDGET_OK;
-}
-
+  /* Document-method: new
+   * call-seq: new
+   *
+   * Creates a Phidget Manager object.
+   */
+  rb_define_method(ph_manager, "initialize", ph_manager_init, 0);
 
-int ph_manager_on_server_connect(CPhidgetManagerHandle phid, void *userPtr) {
-  ph_callback_data_t *callback_data = ((ph_callback_data_t *)userPtr);
-  callback_data->called = true;
-  return EPHIDGET_OK;
-}
+  /* Document-method: open
+   * call-seq: open
+   *
+   * Opens the Phidget Manager.
+   * Be sure to register Attach and Detach event handlers for the Manager before opening it, to ensure you program doesn't miss the events reported for devices already connected to your system.
+   */
+  rb_define_method(ph_manager, "open", ph_manager_open, 0);
 
+  /* Document-method: close
+   * call-seq: close
+   *
+   * Closes a Phidget Manager that has been opened. PhidgetManage#close will release the Phidget Manager, and should be called prior to delete.
+   */
+  rb_define_method(ph_manager, "close", ph_manager_close, 0);
 
-int ph_manager_on_server_disconnect(CPhidgetManagerHandle phid, void *userPtr) {
-  ph_callback_data_t *callback_data = ((ph_callback_data_t *)userPtr);
-  callback_data->called = true;
-  return EPHIDGET_OK;
+  rb_define_private_method(ph_manager, "ext_setOnAttachHandler", ph_manager_set_on_attach_handler, 1);
+  rb_define_private_method(ph_manager, "ext_setOnDetachHandler", ph_manager_set_on_detach_handler, 1);
 }
-#endif