phidgets 0.1.3 → 1.0.0

data/ext/phidgets/phidgets.h

@@ -3,85 +3,104 @@
 #include <math.h>
 #include <time.h>
 #include <unistd.h>
+#include <semaphore.h>
 
 #include <ruby.h>
-#include <phidget21.h>
+#include <phidget22.h>
 
 #ifndef _PHIDGETS_EXT_
 #define _PHIDGETS_EXT_
 
 
 #define PH_CALLBACK_POLLING_INTERVAL   100000
-#define EPHIDGET_NOTIMPLEMENTED        PHIDGET_ERROR_CODE_COUNT
+#define EPHIDGET_NOTIMPLEMENTED        0x5000
 
 
-#ifdef PH_CALLBACK
 typedef struct ph_callback_data {
-  volatile bool called;
+  sem_t handler_ready;
+  sem_t callback_called;
   volatile bool exit;
   VALUE phidget;
   VALUE callback;
+  VALUE arg1;
+  VALUE arg2;
+  VALUE arg3;
+  VALUE arg4;
 } ph_callback_data_t;
 
 void ph_callback_thread(ph_callback_data_t *callback_data);
-#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
-typedef void * ph_callback_return_t;
-#else
-typedef VALUE ph_callback_return_t;
-#endif
-ph_callback_return_t wait_for_callback(void *arg);
+void *wait_for_callback(void *arg);
 void cancel_wait_for_callback(void *arg);
-#endif
 
 
 typedef struct ph_data {
-  CPhidgetHandle handle;
-#ifdef PH_CALLBACK
+  PhidgetHandle handle;
   ph_callback_data_t attach_callback;
   ph_callback_data_t detach_callback;
-  ph_callback_data_t server_connect_callback;
-  ph_callback_data_t server_disconnect_callback;
-  ph_callback_data_t dev_callback_1;
-  ph_callback_data_t dev_callback_2;
-  ph_callback_data_t dev_callback_3;
-  ph_callback_data_t dev_callback_4;
-  ph_callback_data_t dev_callback_5;
-  ph_callback_data_t dev_callback_6;
-  ph_callback_data_t dev_callback_7;
-  ph_callback_data_t dev_callback_8;
-#endif
+  ph_callback_data_t error_callback;
+  ph_callback_data_t property_change_callback;
+  ph_callback_data_t dev_callbacks[4];
 } ph_data_t;
 
 
 void Init_phidgets();
+void Init_logging();
 void Init_dictionary();
 void Init_manager();
 void Init_common();
 void Init_accelerometer();
-void Init_advanced_servo();
-void Init_analog();
-void Init_bridge();
+void Init_bldc_motor();
+void Init_capacitive_touch();
+void Init_current_input();
+void Init_dc_motor();
+void Init_digital_input();
+void Init_digital_output();
+void Init_distance();
 void Init_encoder();
 void Init_frequency_counter();
 void Init_gps();
-void Init_interface_kit();
+void Init_gyroscope();
+void Init_hub();
+void Init_humidity();
 void Init_ir();
-void Init_led();
-void Init_motor_control();
+void Init_lcd();
+void Init_light();
+void Init_magnetometer();
+void Init_motor_position_controller();
 void Init_ph_sensor();
+void Init_power_guard();
+void Init_pressure();
+void Init_rc_servo();
 void Init_rfid();
-void Init_servo();
+void Init_resistance();
+void Init_sound();
 void Init_spatial();
 void Init_stepper();
 void Init_temperature_sensor();
-void Init_text_lcd();
-void Init_text_led();
-void Init_weight_sensor();
+void Init_voltage_input();
+void Init_voltage_output();
+void Init_voltage_ratio_input();
 
 
 ph_data_t *get_ph_data(VALUE self);
-CPhidgetHandle get_ph_handle(VALUE self);
+PhidgetHandle get_ph_handle(VALUE self);
 void ph_raise(int err_code);
 
+typedef PhidgetReturnCode (*phidget_get_int_func)(PhidgetHandle, int *);
+typedef PhidgetReturnCode (*phidget_get_uint_func)(PhidgetHandle, uint32_t *);
+typedef PhidgetReturnCode (*phidget_get_int64_func)(PhidgetHandle, int64_t *);
+typedef PhidgetReturnCode (*phidget_get_uint64_func)(PhidgetHandle, uint64_t *);
+typedef PhidgetReturnCode (*phidget_get_bool_func)(PhidgetHandle, int *);
+typedef PhidgetReturnCode (*phidget_get_double_func)(PhidgetHandle, double *);
+typedef PhidgetReturnCode (*phidget_get_string_func)(PhidgetHandle, const char **);
+
+VALUE ph_get_int(PhidgetHandle handle, phidget_get_int_func func);
+VALUE ph_get_uint(PhidgetHandle handle, phidget_get_uint_func func);
+VALUE ph_get_int64(PhidgetHandle handle, phidget_get_int64_func func);
+VALUE ph_get_uint64(PhidgetHandle handle, phidget_get_uint64_func func);
+VALUE ph_get_bool(PhidgetHandle handle, phidget_get_bool_func func);
+VALUE ph_get_double(PhidgetHandle handle, phidget_get_double_func func);
+VALUE ph_get_string(PhidgetHandle handle, phidget_get_string_func func);
+
 #endif
 

data/ext/phidgets/phidgets_accelerometer.c

@@ -1,165 +1,249 @@
 
 #include "phidgets.h"
 
+#define ACCELEROMETER_ACCELERATION_CHANGE_CALLBACK  0
 
-VALUE ph_accel_init(VALUE self);
-VALUE ph_accel_get_axis_count(VALUE self);
-VALUE ph_accel_get_acceleration(VALUE self, VALUE index);
-VALUE ph_accel_get_acceleration_min(VALUE self, VALUE index);
-VALUE ph_accel_get_acceleration_max(VALUE self, VALUE index);
-VALUE ph_accel_get_acceleration_change_trigger(VALUE self, VALUE index);
-VALUE ph_accel_set_acceleration_change_trigger(VALUE self, VALUE index, VALUE trigger);
 
-#ifdef PH_CALLBACK
-VALUE ph_accel_set_on_acceleration_change_handler(VALUE self, VALUE handler);
-int ph_accel_on_acceleration_change(CPhidgetAccelerometerHandle phid, void *userPtr, int index, double accel);
-#endif
+VALUE ph_accel_init(VALUE self) {
+  ph_data_t *ph = get_ph_data(self);
+  ph_raise(PhidgetAccelerometer_create((PhidgetAccelerometerHandle *)(&(ph->handle))));
+  return self;
+}
 
 
+VALUE ph_accel_get_axis_count(VALUE self) {
+  return ph_get_int(get_ph_handle(self), (phidget_get_int_func)PhidgetAccelerometer_getAxisCount);
+}
 
-void Init_accelerometer() {
-  VALUE ph_module = rb_const_get(rb_cObject, rb_intern("Phidgets"));
-  VALUE ph_common = rb_const_get(ph_module, rb_intern("Common"));
-  VALUE ph_accel = rb_define_class_under(ph_module, "Accelerometer", ph_common);
 
-  /* Document-method: new
-   * call-seq: new
-   *
-   * Creates a Phidget Accelerometer object.
-   */
-  rb_define_method(ph_accel, "initialize", ph_accel_init, 0);
+VALUE ph_accel_get_acceleration(VALUE self) {
+  double accel[3];
+  ph_raise(PhidgetAccelerometer_getAcceleration((PhidgetAccelerometerHandle)get_ph_handle(self), &accel));
+  return rb_ary_new3(3, DBL2NUM(accel[0]), DBL2NUM(accel[1]), DBL2NUM(accel[2]));
+}
 
-  /* Document-method: getAxisCount
-   * call-seq: getAxisCount
-   *
-   * Gets the number of acceleration axes supported by this accelerometer.
-   */
-  rb_define_method(ph_accel, "getAxisCount", ph_accel_get_axis_count, 0);
 
-  /* Document-method: getAcceleration
-   * call-seq: getAcceleration(index)
-   *
-   * Gets the current acceleration of an axis.
-   */
-  rb_define_method(ph_accel, "getAcceleration", ph_accel_get_acceleration, 1);
+VALUE ph_accel_get_min_acceleration(VALUE self) {
+  double accel[3];
+  ph_raise(PhidgetAccelerometer_getMinAcceleration((PhidgetAccelerometerHandle)get_ph_handle(self), &accel));
+  return rb_ary_new3(3, DBL2NUM(accel[0]), DBL2NUM(accel[1]), DBL2NUM(accel[2]));
+}
 
-  /* Document-method: getAccelerationMin
-   * call-seq: getAccelerationMin(index)
-   *
-   * Gets the minimum acceleraiton supported by an axis.
-   */
-  rb_define_method(ph_accel, "getAccelerationMin", ph_accel_get_acceleration_min, 1);
 
-  /* Document-method: getAccelerationMax
-   * call-seq: getAccelerationMax(index)
-   *
-   * Gets the maximum accleration supported by an axis.
-   */
-  rb_define_method(ph_accel, "getAccelerationMax", ph_accel_get_acceleration_max, 1);
+VALUE ph_accel_get_max_acceleration(VALUE self) {
+  double accel[3];
+  ph_raise(PhidgetAccelerometer_getMaxAcceleration((PhidgetAccelerometerHandle)get_ph_handle(self), &accel));
+  return rb_ary_new3(3, DBL2NUM(accel[0]), DBL2NUM(accel[1]), DBL2NUM(accel[2]));
+}
 
-  /* Document-method: getAccelerationChangeTrigger
-   * call-seq: getAccelerationChangeTrigger(index)
-   *
-   * Gets the change trigger for an axis.
-   */
-  rb_define_method(ph_accel, "getAccelerationChangeTrigger", ph_accel_get_acceleration_change_trigger, 1);
 
-  /* Document-method: setAccelerationChangeTrigger
-   * call-seq: setAccelerationChangeTrigger(index, trigger)
-   *
-   * Sets the change trigger for an axis.
-   */
-  rb_define_method(ph_accel, "setAccelerationChangeTrigger", ph_accel_set_acceleration_change_trigger, 2);
+VALUE ph_accel_get_acceleration_change_trigger(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetAccelerometer_getAccelerationChangeTrigger);
+}
 
-#ifdef PH_CALLBACK
-  rb_define_private_method(ph_accel, "ext_setOnAccelerationChangeHandler", ph_accel_set_on_acceleration_change_handler, 1);
-#endif
 
-  rb_define_alias(ph_accel, "axis_count", "getAxisCount");
-  rb_define_alias(ph_accel, "acceleration", "getAcceleration");
-  rb_define_alias(ph_accel, "acceleration_min", "getAccelerationMin");
-  rb_define_alias(ph_accel, "acceleration_max", "getAccelerationMax");
-  rb_define_alias(ph_accel, "acceleration_change_trigger", "getAccelerationChangeTrigger");
-  rb_define_alias(ph_accel, "set_acceleration_change_trigger", "setAccelerationChangeTrigger");
+VALUE ph_accel_set_acceleration_change_trigger(VALUE self, VALUE trigger) {
+  ph_raise(PhidgetAccelerometer_setAccelerationChangeTrigger((PhidgetAccelerometerHandle)get_ph_handle(self), NUM2DBL(trigger)));
+  return Qnil;
 }
 
 
-VALUE ph_accel_init(VALUE self) {
-  ph_data_t *ph = get_ph_data(self);
-  ph_raise(CPhidgetAccelerometer_create((CPhidgetAccelerometerHandle *)(&(ph->handle))));
-  return self;
+VALUE ph_accel_get_min_acceleration_change_trigger(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetAccelerometer_getMinAccelerationChangeTrigger);
 }
 
 
-VALUE ph_accel_get_axis_count(VALUE self) {
-  CPhidgetAccelerometerHandle handle = (CPhidgetAccelerometerHandle)get_ph_handle(self);
-  int count;
-  ph_raise(CPhidgetAccelerometer_getAxisCount(handle, &count));
-  return INT2FIX(count);
+VALUE ph_accel_get_max_acceleration_change_trigger(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetAccelerometer_getMaxAccelerationChangeTrigger);
 }
 
 
-VALUE ph_accel_get_acceleration(VALUE self, VALUE index) {
-  CPhidgetAccelerometerHandle handle = (CPhidgetAccelerometerHandle)get_ph_handle(self);
-  double accel;
-  ph_raise(CPhidgetAccelerometer_getAcceleration(handle, NUM2INT(index), &accel));
-  return rb_float_new(accel);
+VALUE ph_accel_get_data_interval(VALUE self) {
+  return ph_get_uint(get_ph_handle(self), (phidget_get_uint_func)PhidgetAccelerometer_getDataInterval);
 }
 
 
-VALUE ph_accel_get_acceleration_min(VALUE self, VALUE index) {
-  CPhidgetAccelerometerHandle handle = (CPhidgetAccelerometerHandle)get_ph_handle(self);
-  double accel;
-  ph_raise(CPhidgetAccelerometer_getAccelerationMin(handle, NUM2INT(index), &accel));
-  return rb_float_new(accel);
+VALUE ph_accel_set_data_interval(VALUE self, VALUE interval) {
+  ph_raise(PhidgetAccelerometer_setDataInterval((PhidgetAccelerometerHandle)get_ph_handle(self), NUM2UINT(interval)));
+  return Qnil;
 }
 
 
-VALUE ph_accel_get_acceleration_max(VALUE self, VALUE index) {
-  CPhidgetAccelerometerHandle handle = (CPhidgetAccelerometerHandle)get_ph_handle(self);
-  double accel;
-  ph_raise(CPhidgetAccelerometer_getAccelerationMax(handle, NUM2INT(index), &accel));
-  return rb_float_new(accel);
+VALUE ph_accel_get_min_data_interval(VALUE self) {
+  return ph_get_uint(get_ph_handle(self), (phidget_get_uint_func)PhidgetAccelerometer_getMinDataInterval);
 }
 
 
-VALUE ph_accel_get_acceleration_change_trigger(VALUE self, VALUE index) {
-  CPhidgetAccelerometerHandle handle = (CPhidgetAccelerometerHandle)get_ph_handle(self);
-  double trigger;
-  ph_raise(CPhidgetAccelerometer_getAccelerationChangeTrigger(handle, NUM2INT(index), &trigger));
-  return rb_float_new(trigger);
+VALUE ph_accel_get_max_data_interval(VALUE self) {
+  return ph_get_uint(get_ph_handle(self), (phidget_get_uint_func)PhidgetAccelerometer_getMaxDataInterval);
 }
 
 
-VALUE ph_accel_set_acceleration_change_trigger(VALUE self, VALUE index, VALUE trigger) {
-  CPhidgetAccelerometerHandle handle = (CPhidgetAccelerometerHandle)get_ph_handle(self);
-  ph_raise(CPhidgetAccelerometer_setAccelerationChangeTrigger(handle, NUM2INT(index), NUM2DBL(trigger)));
-  return Qnil;
+VALUE ph_accel_get_timestamp(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetAccelerometer_getTimestamp);
+}
+
+
+void CCONV ph_accel_on_acceleration_change(PhidgetAccelerometerHandle phid, void *userPtr, const double accel[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(accel[0]), DBL2NUM(accel[1]), DBL2NUM(accel[2]));
+  callback_data->arg2 = DBL2NUM(timestamp);
+  callback_data->arg3 = Qnil;
+  callback_data->arg4 = Qnil;
+  sem_post(&callback_data->callback_called);
 }
 
-#ifdef PH_CALLBACK
+
 VALUE ph_accel_set_on_acceleration_change_handler(VALUE self, VALUE handler) {
   ph_data_t *ph = get_ph_data(self);
-  ph_callback_data_t *callback_data = &ph->dev_callback_1;
+  ph_callback_data_t *callback_data = &ph->dev_callbacks[ACCELEROMETER_ACCELERATION_CHANGE_CALLBACK];
   if( TYPE(handler) == T_NIL ) {
+    callback_data->callback = T_NIL;
     callback_data->exit = true;
-    ph_raise(CPhidgetAccelerometer_set_OnAccelerationChange_Handler((CPhidgetAccelerometerHandle)ph->handle, NULL, (void *)NULL));
+    ph_raise(PhidgetAccelerometer_setOnAccelerationChangeHandler((PhidgetAccelerometerHandle)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(CPhidgetAccelerometer_set_OnAccelerationChange_Handler((CPhidgetAccelerometerHandle)ph->handle, ph_accel_on_acceleration_change, (void *)callback_data));
+    ph_raise(PhidgetAccelerometer_setOnAccelerationChangeHandler((PhidgetAccelerometerHandle)ph->handle, ph_accel_on_acceleration_change, (void *)callback_data));
     ph_callback_thread(callback_data);
   }
   return Qnil;
 }
 
 
-int ph_accel_on_acceleration_change(CPhidgetAccelerometerHandle phid, void *userPtr, int index, double accel) {
-  ph_callback_data_t *callback_data = ((ph_callback_data_t *)userPtr);
-  callback_data->called = true;
-  return EPHIDGET_OK;
+
+void Init_accelerometer() {
+  VALUE ph_module = rb_const_get(rb_cObject, rb_intern("Phidgets"));
+  VALUE ph_common = rb_const_get(ph_module, rb_intern("Common"));
+  VALUE ph_accel = rb_define_class_under(ph_module, "Accelerometer", ph_common);
+
+  /* Document-method: new
+   * call-seq: new
+   *
+   * Creates a Phidget Accelerometer object.
+   */
+  rb_define_method(ph_accel, "initialize", ph_accel_init, 0);
+
+  /* Document-method: getAxisCount
+   * call-seq: getAxisCount -> axis_count
+   *
+   * The number of axes the channel can measure acceleration on.
+   * See your device's User Guide for more information about the number of axes and their orientation.
+   */
+  rb_define_method(ph_accel, "getAxisCount", ph_accel_get_axis_count, 0);
+  rb_define_alias(ph_accel, "axis_count", "getAxisCount");
+
+  /* Document-method: getAcceleration
+   * call-seq: getAcceleration -> acceleration
+   *
+   * The most recent acceleration value that the channel has reported.
+   * This value will always be between MinAcceleration and MaxAcceleration.
+   */
+  rb_define_method(ph_accel, "getAcceleration", ph_accel_get_acceleration, 0);
+  rb_define_alias(ph_accel, "acceleration", "getAcceleration");
+
+  /* Document-method: getMinAcceleration
+   * call-seq: getMinAcceleration -> min_acceleration
+   *
+   * The minimum value the AccelerationChange event will report.
+   */
+  rb_define_method(ph_accel, "getMinAcceleration", ph_accel_get_min_acceleration, 0);
+  rb_define_alias(ph_accel, "min_acceleration", "getMinAcceleration");
+
+  /* Document-method: getMaxAcceleration
+   * call-seq: getMaxAcceleration -> max_acceleration
+   *
+   * The maximum value the AccelerationChange event will report.
+   */
+  rb_define_method(ph_accel, "getMaxAcceleration", ph_accel_get_max_acceleration, 0);
+  rb_define_alias(ph_accel, "max_acceleration", "getMaxAcceleration");
+
+  /* Document-method: getAccelerationChangeTrigger
+   * call-seq: getAccelerationChangeTrigger -> trigger
+   *
+   * The channel will not issue a AccelerationChange event until the acceleration value has changed
+   * by the amount specified by the AccelerationChangeTrigger.
+   * Setting the AccelerationChangeTrigger 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_accel, "getAccelerationChangeTrigger", ph_accel_get_acceleration_change_trigger, 0);
+  rb_define_alias(ph_accel, "acceleration_change_trigger", "getAccelerationChangeTrigger");
+
+  /* Document-method: setAccelerationChangeTrigger
+   * call-seq: setAccelerationChangeTrigger(trigger)
+   *
+   * The channel will not issue a AccelerationChange event until the acceleration value has changed
+   * by the amount specified by the AccelerationChangeTrigger.
+   * Setting the AccelerationChangeTrigger 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_accel, "setAccelerationChangeTrigger", ph_accel_set_acceleration_change_trigger, 1);
+  rb_define_alias(ph_accel, "acceleration_change_trigger=", "setAccelerationChangeTrigger");
+
+  /* Document-method: getMinAccelerationChangeTrigger
+   * call-seq: getMinAccelerationChangeTrigger -> trigger
+   *
+   * The minimum value that AccelerationChangeTrigger can be set to.
+   */
+  rb_define_method(ph_accel, "getMinAccelerationChangeTrigger", ph_accel_get_min_acceleration_change_trigger, 0);
+  rb_define_alias(ph_accel, "min_acceleration_change_trigger", "getMinAccelerationChangeTrigger");
+
+  /* Document-method: getMaxAccelerationChangeTrigger
+   * call-seq: getMaxAccelerationChangeTrigger -> trigger
+   *
+   * The maximum value that AccelerationChangeTrigger can be set to.
+   */
+  rb_define_method(ph_accel, "getMaxAccelerationChangeTrigger", ph_accel_get_max_acceleration_change_trigger, 0);
+  rb_define_alias(ph_accel, "max_acceleration_change_trigger", "getMaxAccelerationChangeTrigger");
+
+  /* Document-method: getDataInterval
+   * call-seq: getDataInterval -> interval
+   *
+   * The DataInterval is the time that must elapse before the channel will fire another Phidget_OnAccelerationChangeCallback event.
+   * The data interval is bounded by MinDataInterval and MaxDataInterval.
+   * The timing between AccelerationChange events can also be affected by the AccelerationChangeTrigger.
+   */
+  rb_define_method(ph_accel, "getDataInterval", ph_accel_get_data_interval, 0);
+  rb_define_alias(ph_accel, "data_interval", "getDataInterval");
+
+  /* Document-method: setDataInterval
+   * call-seq: setDataInterval(interval)
+   *
+   * The DataInterval is the time that must elapse before the channel will fire another Phidget_OnAccelerationChangeCallback event.
+   * The data interval is bounded by MinDataInterval and MaxDataInterval.
+   * The timing between AccelerationChange events can also be affected by the AccelerationChangeTrigger.
+   */
+  rb_define_method(ph_accel, "setDataInterval", ph_accel_set_data_interval, 1);
+  rb_define_alias(ph_accel, "data_interval=", "setDataInterval");
+
+  /* Document-method: getMinDataInterval
+   * call-seq: getMinDataInterval -> interval
+   *
+   * The minimum value that DataInterval can be set to.
+   */
+  rb_define_method(ph_accel, "getMinDataInterval", ph_accel_get_min_data_interval, 0);
+  rb_define_alias(ph_accel, "min_data_interval", "getMinDataInterval");
+
+  /* Document-method: getMaxDataInterval
+   * call-seq: getMaxDataInterval -> interval
+   *
+   * The maximum value that DataInterval can be set to.
+   */
+  rb_define_method(ph_accel, "getMaxDataInterval", ph_accel_get_max_data_interval, 0);
+  rb_define_alias(ph_accel, "max_data_interval", "getMaxDataInterval");
+
+  /* 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_accel, "getTimestamp", ph_accel_get_timestamp, 0);
+  rb_define_alias(ph_accel, "timestamp", "getTimestamp");
+
+  rb_define_private_method(ph_accel, "ext_setOnAccelerationChangeHandler", ph_accel_set_on_acceleration_change_handler, 1);
 }
-#endif