phidgets 0.1.3 → 1.0.0

data/ext/phidgets/phidgets_resistance_input.c

@@ -0,0 +1,227 @@
+
+#include "phidgets.h"
+
+#define RESISTANCE_INPUT_RESISTANCE_CHANGE_CALLBACK    0
+
+
+VALUE ph_resistance_init(VALUE self) {
+  ph_data_t *ph = get_ph_data(self);
+  ph_raise(PhidgetResistanceInput_create((PhidgetResistanceInputHandle *)(&(ph->handle))));
+  return self;
+}
+
+VALUE ph_resistance_get_data_interval(VALUE self) {
+  return ph_get_uint(get_ph_handle(self), (phidget_get_uint_func)PhidgetResistanceInput_getDataInterval);
+}
+
+VALUE ph_resistance_set_data_interval(VALUE self, VALUE interval) {
+  ph_raise(PhidgetResistanceInput_setDataInterval((PhidgetResistanceInputHandle)get_ph_handle(self), NUM2UINT(interval)));
+  return Qnil;
+}
+
+VALUE ph_resistance_get_min_data_interval(VALUE self) {
+  return ph_get_uint(get_ph_handle(self), (phidget_get_uint_func)PhidgetResistanceInput_getMinDataInterval);
+}
+
+VALUE ph_resistance_get_max_data_interval(VALUE self) {
+  return ph_get_uint(get_ph_handle(self), (phidget_get_uint_func)PhidgetResistanceInput_getMaxDataInterval);
+}
+
+VALUE ph_resistance_get_resistance(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetResistanceInput_getResistance);
+}
+
+VALUE ph_resistance_get_min_resistance(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetResistanceInput_getMinResistance);
+}
+
+VALUE ph_resistance_get_max_resistance(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetResistanceInput_getMaxResistance);
+}
+
+VALUE ph_resistance_get_resistance_change_trigger(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetResistanceInput_getResistanceChangeTrigger);
+}
+
+VALUE ph_resistance_set_resistance_change_trigger(VALUE self, VALUE change_trigger) {
+  ph_raise(PhidgetResistanceInput_setResistanceChangeTrigger((PhidgetResistanceInputHandle)get_ph_handle(self), NUM2DBL(change_trigger)));
+  return Qnil;
+}
+
+VALUE ph_resistance_get_min_resistance_change_trigger(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetResistanceInput_getMinResistanceChangeTrigger);
+}
+
+VALUE ph_resistance_get_max_resistance_change_trigger(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetResistanceInput_getMaxResistanceChangeTrigger);
+}
+
+VALUE ph_resistance_get_rtd_wire_setup(VALUE self) {
+  return ph_get_int(get_ph_handle(self), (phidget_get_int_func)PhidgetResistanceInput_getRTDWireSetup);
+}
+
+VALUE ph_resistance_set_rtd_wire_setup(VALUE self, VALUE wire_setup) {
+  ph_raise(PhidgetResistanceInput_setRTDWireSetup((PhidgetResistanceInputHandle)get_ph_handle(self), NUM2INT(wire_setup)));
+  return Qnil;
+}
+
+
+void CCONV ph_resistance_on_resistance_change(PhidgetResistanceInputHandle phid, void *userPtr, double resistance) {
+  ph_callback_data_t *callback_data = ((ph_callback_data_t *)userPtr);
+  while(sem_wait(&callback_data->handler_ready)!=0) {};
+  callback_data->arg1 = DBL2NUM(resistance);
+  callback_data->arg2 = Qnil;
+  callback_data->arg3 = Qnil;
+  callback_data->arg4 = Qnil;
+  sem_post(&callback_data->callback_called);
+}
+
+
+VALUE ph_resistance_set_on_resistance_change_handler(VALUE self, VALUE handler) {
+  ph_data_t *ph = get_ph_data(self);
+  ph_callback_data_t *callback_data = &ph->dev_callbacks[RESISTANCE_INPUT_RESISTANCE_CHANGE_CALLBACK];
+  if( TYPE(handler) == T_NIL ) {
+    callback_data->callback = T_NIL;
+    callback_data->exit = true;
+    ph_raise(PhidgetResistanceInput_setOnResistanceChangeHandler((PhidgetResistanceInputHandle)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(PhidgetResistanceInput_setOnResistanceChangeHandler((PhidgetResistanceInputHandle)ph->handle, ph_resistance_on_resistance_change, (void *)callback_data));
+    ph_callback_thread(callback_data);
+  }
+  return Qnil;
+}
+
+
+void Init_resistance() {
+  VALUE ph_module = rb_const_get(rb_cObject, rb_intern("Phidgets"));
+  VALUE ph_common = rb_const_get(ph_module, rb_intern("Common"));
+  VALUE ph_resistance = rb_define_class_under(ph_module, "ResistanceInput", ph_common);
+
+  /* Document-method: new
+   * call-seq: new
+   *
+   * Creates a Phidget ResistanceInput object.
+   */
+  rb_define_method(ph_resistance, "initialize", ph_resistance_init, 0);
+
+  /* Document-method: getDataInterval
+   * call-seq: getDataInterval -> interval
+   *
+   * The DataInterval is the time that must elapse before the channel will fire another ResistanceChange event.
+   * The data interval is bounded by MinDataInterval and MaxDataInterval.
+   * The timing between ResistanceChange events can also affected by the ResistanceChangeTrigger.
+   */
+  rb_define_method(ph_resistance, "getDataInterval", ph_resistance_get_data_interval, 0);
+  rb_define_alias(ph_resistance, "data_interval", "getDataInterval");
+
+  /* Document-method: setDataInterval
+   * call-seq: setDataInterval(interval)
+   *
+   * The DataInterval is the time that must elapse before the channel will fire another ResistanceChange event.
+   * The data interval is bounded by MinDataInterval and MaxDataInterval.
+   * The timing between ResistanceChange events can also affected by the ResistanceChangeTrigger.
+   */
+  rb_define_method(ph_resistance, "setDataInterval", ph_resistance_set_data_interval, 1);
+  rb_define_alias(ph_resistance, "data_interval=", "setDataInterval");
+
+  /* Document-method: getMinDataInterval
+   * call-seq: getMinDataInterval -> interval
+   *
+   * The minimum value that DataInterval can be set to.
+   */
+  rb_define_method(ph_resistance, "getMinDataInterval", ph_resistance_get_min_data_interval, 0);
+  rb_define_alias(ph_resistance, "min_data_interval", "getMinDataInterval");
+
+  /* Document-method: getMaxDataInterval
+   * call-seq: getMaxDataInterval -> interval
+   *
+   * The maximum value that DataInterval can be set to.
+   */
+  rb_define_method(ph_resistance, "getMaxDataInterval", ph_resistance_get_max_data_interval, 0);
+  rb_define_alias(ph_resistance, "max_data_interval", "getMaxDataInterval");
+
+  /* Document-method: getResistance
+   * call-seq: getResistance -> resistance
+   *
+   * The most recent resistance value that the channel has reported.
+   * This value will always be between MinResistance and MaxResistance.
+   */
+  rb_define_method(ph_resistance, "getResistance", ph_resistance_get_resistance, 0);
+  rb_define_alias(ph_resistance, "resistance", "getResistance");
+
+  /* Document-method: getMinResistance
+   * call-seq: getMinResistance -> resistance
+   *
+   * The minimum value that the ResistanceChange event will report.
+   */
+  rb_define_method(ph_resistance, "getMinResistance", ph_resistance_get_min_resistance, 0);
+  rb_define_alias(ph_resistance, "min_resistance", "getMinResistance");
+
+  /* Document-method: getMaxResistance
+   * call-seq: getMaxResistance -> resistance
+   *
+   * The maximum value that the ResistanceChange event will report.
+   */
+  rb_define_method(ph_resistance, "getMaxResistance", ph_resistance_get_max_resistance, 0);
+  rb_define_alias(ph_resistance, "max_resistance", "getMaxResistance");
+
+  /* Document-method: getResistanceChangeTrigger
+   * call-seq: getResistanceChangeTrigger -> change_trigger
+   *
+   * The channel will not issue a ResistanceChange event until the resistance value has changed by the amount specified by the ResistanceChangeTrigger.
+   * Setting the ResistanceChangeTrigger 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_resistance, "getResistanceChangeTrigger", ph_resistance_get_resistance_change_trigger, 0);
+  rb_define_alias(ph_resistance, "resistance_change_trigger", "getResistanceChangeTrigger");
+
+  /* Document-method: setResistanceChangeTrigger
+   * call-seq: setResistanceChangeTrigger(change_trigger)
+   *
+   * The channel will not issue a ResistanceChange event until the resistance value has changed by the amount specified by the ResistanceChangeTrigger.
+   * Setting the ResistanceChangeTrigger 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_resistance, "setResistanceChangeTrigger", ph_resistance_set_resistance_change_trigger, 1);
+  rb_define_alias(ph_resistance, "resistance_change_trigger=", "setResistanceChangeTrigger");
+
+  /* Document-method: getMinResistanceChangeTrigger
+   * call-seq: getMinResistanceChangeTrigger -> change_trigger
+   *
+   * The minimum value that ResistanceChangeTrigger can be set to.
+   */
+  rb_define_method(ph_resistance, "getMinResistanceChangeTrigger", ph_resistance_get_min_resistance_change_trigger, 0);
+  rb_define_alias(ph_resistance, "min_resistance_change_trigger", "getMinResistanceChangeTrigger");
+
+  /* Document-method: getMaxResistanceChangeTrigger
+   * call-seq: getMaxResistanceChangeTrigger -> change_trigger
+   *
+   * The maximum value that ResistanceChangeTrigger can be set to.
+   */
+  rb_define_method(ph_resistance, "getMaxResistanceChangeTrigger", ph_resistance_get_max_resistance_change_trigger, 0);
+  rb_define_alias(ph_resistance, "max_resistance_change_trigger", "getMaxResistanceChangeTrigger");
+
+  /* Document-method: getRTDWireSetup
+   * call-seq: getRTDWireSetup -> wire_setup
+   *
+   * Select the RTD wiring configuration.
+   * More information about RTD wiring can be found in the user guide.
+   */
+  rb_define_method(ph_resistance, "getRTDWireSetup", ph_resistance_get_rtd_wire_setup, 0);
+  rb_define_alias(ph_resistance, "rtd_wire_setup", "getRTDWireSetup");
+
+  /* Document-method: setRTDWireSetup
+   * call-seq: setRTDWireSetup(wire_setup)
+   *
+   * Select the RTD wiring configuration.
+   * More information about RTD wiring can be found in the user guide.
+   */
+  rb_define_method(ph_resistance, "setRTDWireSetup", ph_resistance_set_rtd_wire_setup, 1);
+  rb_define_alias(ph_resistance, "rtd_wire_setup=", "setRTDWireSetup");
+
+
+  rb_define_private_method(ph_resistance, "ext_setOnResistanceChangeHandler", ph_resistance_set_on_resistance_change_handler, 1);
+}
+

data/ext/phidgets/phidgets_rfid.c

@@ -1,281 +1,167 @@
 
 #include "phidgets.h"
 
-
-VALUE ph_rfid_init(VALUE self);
-VALUE ph_rfid_get_output_count(VALUE self);
-VALUE ph_rfid_get_output_state(VALUE self, VALUE index);
-VALUE ph_rfid_set_output_state(VALUE self, VALUE index, VALUE state);
-VALUE ph_rfid_get_antenna_on(VALUE self);
-VALUE ph_rfid_set_antenna_on(VALUE self, VALUE on);
-VALUE ph_rfid_get_led_on(VALUE self);
-VALUE ph_rfid_set_led_on(VALUE self, VALUE on);
-VALUE ph_rfid_get_last_tag(VALUE self);
-VALUE ph_rfid_get_tag_status(VALUE self);
-VALUE ph_rfid_write(VALUE self, VALUE tag, VALUE protocol, VALUE lock);
-
-#ifdef PH_CALLBACK
-VALUE ph_rfid_set_on_tag_handler(VALUE self, VALUE handler);
-VALUE ph_rfid_set_on_tag_lost_handler(VALUE self, VALUE handler);
-VALUE ph_rfid_set_on_output_change_handler(VALUE self, VALUE handler);
-int ph_rfid_on_tag(CPhidgetRFIDHandle phid, void *userPtr, char *tagString, CPhidgetRFID_Protocol protocol);
-int ph_rfid_on_tag_lost(CPhidgetRFIDHandle phid, void *userPtr, char *tagString, CPhidgetRFID_Protocol protocol);
-int ph_rfid_on_output_change(CPhidgetRFIDHandle phid, void *userPtr, int index, int state);
-#endif
-
-
-void Init_rfid() {
-  VALUE ph_module = rb_const_get(rb_cObject, rb_intern("Phidgets"));
-  VALUE ph_common = rb_const_get(ph_module, rb_intern("Common"));
-  VALUE ph_rfid = rb_define_class_under(ph_module, "RFID", ph_common);
-
-  /* EM4100 (EM4102) 40-bit */
-  rb_define_const(ph_rfid, "PROTOCOL_EM4100", INT2FIX(PHIDGET_RFID_PROTOCOL_EM4100));
-  /* ISO11785 FDX-B encoding (Animal ID) */
-  rb_define_const(ph_rfid, "PROTOCOL_ISO11785_FDX_B", INT2FIX(PHIDGET_RFID_PROTOCOL_ISO11785_FDX_B));
-  /* PhidgetTAG Protocol 24 character ASCII */
-  rb_define_const(ph_rfid, "PROTOCOL_PHIDGETS", INT2FIX(PHIDGET_RFID_PROTOCOL_PHIDGETS));
-
-  /* Document-method: new
-   * call-seq: new
-   *
-   * Creates a Phidget RFID object.
-   */
-  rb_define_method(ph_rfid, "initialize", ph_rfid_init, 0);
-
-  /* Document-method: getOutputCount
-   * call-seq: getOutputCount -> count
-   *
-   * Gets the number of outputs supported by this board.
-   */
-  rb_define_method(ph_rfid, "getOutputCount", ph_rfid_get_output_count, 0);
-
-  /* Document-method: getOutputState
-   * call-seq: getOutputState(index) -> true or false
-   *
-   * Gets the state of an output.
-   */
-  rb_define_method(ph_rfid, "getOutputState", ph_rfid_get_output_state, 1);
-
-  /* Document-method: setOutputState
-   * call-seq: setOutputState(index, state)
-   *
-   * Sets the state of an output.
-   */
-  rb_define_method(ph_rfid, "setOutputState", ph_rfid_set_output_state, 2);
-
-  /* Document-method: getAntennaOn
-   * call-seq: getAntennaOn -> true or false
-   *
-   * Gets the state of the antenna.
-   */
-  rb_define_method(ph_rfid, "getAntennaOn", ph_rfid_get_antenna_on, 0);
-
-  /* Document-method: setAntennaOn
-   * call-seq: setAntennaOn(state)
-   *
-   * Sets the state of the antenna. Note that the antenna must be enabled before tags will be read.
-   */
-  rb_define_method(ph_rfid, "setAntennaOn", ph_rfid_set_antenna_on, 1);
-
-  /* Document-method: getLEDOn
-   * call-seq: getLEDOn -> true or false
-   *
-   * Gets the state of the onboard LED.
-   */
-  rb_define_method(ph_rfid, "getLEDOn", ph_rfid_get_led_on, 0);
-
-  /* Document-method: setLEDOn
-   * call-seq: setLEDOn(state)
-   *
-   * Sets the state of the onboard LED.
-   */
-  rb_define_method(ph_rfid, "setLEDOn", ph_rfid_set_led_on, 1);
-
-  /* Document-method: getLastTag
-   * call-seq: getLastTag -> tag
-   *
-   * Gets the last tag read by the reader. This tag may or may not still be on the reader.
-   */
-  rb_define_method(ph_rfid, "getLastTag", ph_rfid_get_last_tag, 0);
-
-  /* Document-method: getTagStatus
-   * call-seq: getTagStatus -> true or false
-   *
-   * Gets the tag present status. This is whether or not a tag is being read by the reader.
-   */
-  rb_define_method(ph_rfid, "getTagStatus", ph_rfid_get_tag_status, 0);
-
-  /* Document-method: write
-   * call-seq: write(tag, protocol, lock)
-   *
-   * Program a tag. This requires a T5577 tag.
-   */
-  rb_define_method(ph_rfid, "write", ph_rfid_write, 3);
-
-#ifdef PH_CALLBACK
-  rb_define_private_method(ph_rfid, "ext_setOnTagHandler", ph_rfid_set_on_tag_handler, 1);
-  rb_define_private_method(ph_rfid, "ext_setOnTagLostHandler", ph_rfid_set_on_tag_lost_handler, 1);
-  rb_define_private_method(ph_rfid, "ext_setOnOutputChangeHandler", ph_rfid_set_on_output_change_handler, 1);
-#endif
-
-  rb_define_alias(ph_rfid, "output_count", "getOutputCount");
-  rb_define_alias(ph_rfid, "output_state", "getOutputState");
-  rb_define_alias(ph_rfid, "set_output_state", "setOutputState");
-  rb_define_alias(ph_rfid, "antenna_on?", "getAntennaOn");
-  rb_define_alias(ph_rfid, "antenna_on=", "setAntennaOn");
-  rb_define_alias(ph_rfid, "led_on?", "getLEDOn");
-  rb_define_alias(ph_rfid, "led_on=", "setLEDOn");
-  rb_define_alias(ph_rfid, "last_tag", "getLastTag");
-  rb_define_alias(ph_rfid, "tag_status", "getTagStatus");
-}
+#define RFID_TAG_CALLBACK        0
+#define RFID_TAG_LOST_CALLBACK   1
 
 
 
 VALUE ph_rfid_init(VALUE self) {
   ph_data_t *ph = get_ph_data(self);
-  ph_raise(CPhidgetRFID_create((CPhidgetRFIDHandle *)(&(ph->handle))));
+  ph_raise(PhidgetRFID_create((PhidgetRFIDHandle *)(&(ph->handle))));
   return self;
 }
 
-VALUE ph_rfid_get_output_count(VALUE self) {
-  CPhidgetRFIDHandle handle = (CPhidgetRFIDHandle)get_ph_handle(self);
-  int count;
-  ph_raise(CPhidgetRFID_getOutputCount(handle, &count));
-  return INT2FIX(count);
+VALUE ph_rfid_get_antenna_enabled(VALUE self) {
+  return ph_get_bool(get_ph_handle(self), (phidget_get_bool_func)PhidgetRFID_getAntennaEnabled);
 }
 
-VALUE ph_rfid_get_output_state(VALUE self, VALUE index) {
-  CPhidgetRFIDHandle handle = (CPhidgetRFIDHandle)get_ph_handle(self);
-  int state;
-  ph_raise(CPhidgetRFID_getOutputState(handle, FIX2INT(index), &state));
-  return state == PTRUE ? Qtrue : Qfalse;
-}
-
-VALUE ph_rfid_set_output_state(VALUE self, VALUE index, VALUE state) {
-  CPhidgetRFIDHandle handle = (CPhidgetRFIDHandle)get_ph_handle(self);
-  ph_raise(CPhidgetRFID_setOutputState(handle, FIX2INT(index), TYPE(state) == T_TRUE ? PTRUE : PFALSE));
+VALUE ph_rfid_set_antenna_enabled(VALUE self, VALUE on) {
+  ph_raise(PhidgetRFID_setAntennaEnabled((PhidgetRFIDHandle)get_ph_handle(self), TYPE(on) == T_TRUE ? PTRUE : PFALSE));
   return Qnil;
 }
 
-VALUE ph_rfid_get_antenna_on(VALUE self) {
-  CPhidgetRFIDHandle handle = (CPhidgetRFIDHandle)get_ph_handle(self);
-  int on;
-  ph_raise(CPhidgetRFID_getAntennaOn(handle, &on));
-  return on == PTRUE ? Qtrue : Qfalse;
-}
-
-VALUE ph_rfid_set_antenna_on(VALUE self, VALUE on) {
-  CPhidgetRFIDHandle handle = (CPhidgetRFIDHandle)get_ph_handle(self);
-  ph_raise(CPhidgetRFID_setAntennaOn(handle, TYPE(on) == T_TRUE ? PTRUE : PFALSE));
-  return Qnil;
+VALUE ph_rfid_get_last_tag(VALUE self) {
+  char tag[256];
+  PhidgetRFID_Protocol protocol;
+  ph_raise(PhidgetRFID_getLastTag((PhidgetRFIDHandle)get_ph_handle(self), tag, 256, &protocol));
+  return rb_ary_new3(2, rb_str_new2(tag), INT2NUM(protocol));
 }
 
-VALUE ph_rfid_get_led_on(VALUE self) {
-  CPhidgetRFIDHandle handle = (CPhidgetRFIDHandle)get_ph_handle(self);
-  int on;
-  ph_raise(CPhidgetRFID_getLEDOn(handle, &on));
-  return on == PTRUE ? Qtrue : Qfalse;
+VALUE ph_rfid_get_tag_present(VALUE self) {
+  return ph_get_bool(get_ph_handle(self), (phidget_get_bool_func)PhidgetRFID_getTagPresent);
 }
 
-VALUE ph_rfid_set_led_on(VALUE self, VALUE on) {
-  CPhidgetRFIDHandle handle = (CPhidgetRFIDHandle)get_ph_handle(self);
-  ph_raise(CPhidgetRFID_setLEDOn(handle, TYPE(on) == T_TRUE ? PTRUE : PFALSE));
+VALUE ph_rfid_write(VALUE self, VALUE tag, VALUE protocol, VALUE lock) {
+  ph_raise(PhidgetRFID_write((PhidgetRFIDHandle)get_ph_handle(self), StringValueCStr(tag), NUM2INT(protocol), TYPE(lock) == T_TRUE ? PTRUE : PFALSE));
   return Qnil;
 }
 
-VALUE ph_rfid_get_last_tag(VALUE self) {
-  CPhidgetRFIDHandle handle = (CPhidgetRFIDHandle)get_ph_handle(self);
-  char *tag;
-  CPhidgetRFID_Protocol protocol;
-  ph_raise(CPhidgetRFID_getLastTag2(handle, &tag, &protocol));
-  return rb_ary_new3(2, rb_str_new2(tag), INT2FIX(protocol));
-}
 
-VALUE ph_rfid_get_tag_status(VALUE self) {
-  CPhidgetRFIDHandle handle = (CPhidgetRFIDHandle)get_ph_handle(self);
-  int status;
-  ph_raise(CPhidgetRFID_getTagStatus(handle, &status));
-  return status == PTRUE ? Qtrue : Qfalse;
-}
-
-VALUE ph_rfid_write(VALUE self, VALUE tag, VALUE protocol, VALUE lock) {
-  CPhidgetRFIDHandle handle = (CPhidgetRFIDHandle)get_ph_handle(self);
-  ph_raise(CPhidgetRFID_write(handle, StringValueCStr(tag), FIX2INT(protocol), TYPE(lock) == T_TRUE ? PTRUE : PFALSE));
-  return Qnil;
+void CCONV ph_rfid_on_tag(PhidgetRFIDHandle phid, void *userPtr, const char *tagString, PhidgetRFID_Protocol protocol) {
+  ph_callback_data_t *callback_data = ((ph_callback_data_t *)userPtr);
+  while(sem_wait(&callback_data->handler_ready)!=0) {};
+  callback_data->arg1 = rb_str_new2(tagString);
+  callback_data->arg2 = INT2NUM(protocol);
+  callback_data->arg3 = Qnil;
+  callback_data->arg4 = Qnil;
+  sem_post(&callback_data->callback_called);
 }
 
-#ifdef PH_CALLBACK
 VALUE ph_rfid_set_on_tag_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[RFID_TAG_CALLBACK];
   if( TYPE(handler) == T_NIL ) {
+    callback_data->callback = T_NIL;
     callback_data->exit = true;
-    ph_raise(CPhidgetRFID_set_OnTag2_Handler((CPhidgetRFIDHandle)ph->handle, NULL, (void *)NULL));
+    ph_raise(PhidgetRFID_setOnTagHandler((PhidgetRFIDHandle)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(CPhidgetRFID_set_OnTag2_Handler((CPhidgetRFIDHandle)ph->handle, ph_rfid_on_tag, (void *)callback_data));
+    ph_raise(PhidgetRFID_setOnTagHandler((PhidgetRFIDHandle)ph->handle, ph_rfid_on_tag, (void *)callback_data));
     ph_callback_thread(callback_data);
   }
   return Qnil;
 }
 
-VALUE ph_rfid_set_on_tag_lost_handler(VALUE self, VALUE handler) {
-  ph_data_t *ph = get_ph_data(self);
-  ph_callback_data_t *callback_data = &ph->dev_callback_2;
-  if( TYPE(handler) == T_NIL ) {
-    callback_data->exit = true;
-    ph_raise(CPhidgetRFID_set_OnTagLost2_Handler((CPhidgetRFIDHandle)ph->handle, NULL, (void *)NULL));
-  } else {
-    callback_data->called = false;
-    callback_data->exit = false;
-    callback_data->phidget = self;
-    callback_data->callback = handler;
-    ph_raise(CPhidgetRFID_set_OnTagLost2_Handler((CPhidgetRFIDHandle)ph->handle, ph_rfid_on_tag_lost, (void *)callback_data));
-    ph_callback_thread(callback_data);
-  }
-  return Qnil;
+
+void CCONV ph_rfid_on_tag_lost(PhidgetRFIDHandle phid, void *userPtr, const char *tagString, PhidgetRFID_Protocol protocol) {
+  ph_callback_data_t *callback_data = ((ph_callback_data_t *)userPtr);
+  while(sem_wait(&callback_data->handler_ready)!=0) {};
+  callback_data->arg1 = rb_str_new2(tagString);
+  callback_data->arg2 = INT2NUM(protocol);
+  callback_data->arg3 = Qnil;
+  callback_data->arg4 = Qnil;
+  sem_post(&callback_data->callback_called);
 }
 
-VALUE ph_rfid_set_on_output_change_handler(VALUE self, VALUE handler) {
+VALUE ph_rfid_set_on_tag_lost_handler(VALUE self, VALUE handler) {
   ph_data_t *ph = get_ph_data(self);
-  ph_callback_data_t *callback_data = &ph->dev_callback_3;
+  ph_callback_data_t *callback_data = &ph->dev_callbacks[RFID_TAG_LOST_CALLBACK];
   if( TYPE(handler) == T_NIL ) {
+    callback_data->callback = T_NIL;
     callback_data->exit = true;
-    ph_raise(CPhidgetRFID_set_OnOutputChange_Handler((CPhidgetRFIDHandle)ph->handle, NULL, (void *)NULL));
+    ph_raise(PhidgetRFID_setOnTagLostHandler((PhidgetRFIDHandle)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(CPhidgetRFID_set_OnOutputChange_Handler((CPhidgetRFIDHandle)ph->handle, ph_rfid_on_output_change, (void *)callback_data));
+    ph_raise(PhidgetRFID_setOnTagLostHandler((PhidgetRFIDHandle)ph->handle, ph_rfid_on_tag, (void *)callback_data));
     ph_callback_thread(callback_data);
   }
   return Qnil;
 }
 
 
-int ph_rfid_on_tag(CPhidgetRFIDHandle phid, void *userPtr, char *tagString, CPhidgetRFID_Protocol protocol) {
-  ph_callback_data_t *callback_data = ((ph_callback_data_t *)userPtr);
-  callback_data->called = true;
-  return EPHIDGET_OK;
-}
+void Init_rfid() {
+  VALUE ph_module = rb_const_get(rb_cObject, rb_intern("Phidgets"));
+  VALUE ph_common = rb_const_get(ph_module, rb_intern("Common"));
+  VALUE ph_rfid = rb_define_class_under(ph_module, "RFID", ph_common);
 
+  /* EM4100 (EM4102) 40-bit */
+  rb_define_const(ph_rfid, "PROTOCOL_EM4100", INT2NUM(PROTOCOL_EM4100));
+  /* ISO11785 FDX-B encoding (Animal ID) */
+  rb_define_const(ph_rfid, "PROTOCOL_ISO11785_FDX_B", INT2NUM(PROTOCOL_ISO11785_FDX_B));
+  /* PhidgetTAG Protocol 24 character ASCII */
+  rb_define_const(ph_rfid, "PROTOCOL_PHIDGETS", INT2NUM(PROTOCOL_PHIDGETS));
 
-int ph_rfid_on_tag_lost(CPhidgetRFIDHandle phid, void *userPtr, char *tagString, CPhidgetRFID_Protocol protocol) {
-  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 RFID object.
+   */
+  rb_define_method(ph_rfid, "initialize", ph_rfid_init, 0);
 
+  /* Document-method: getAntennaEnabled
+   * call-seq: getAntennaEnabled -> true or false
+   *
+   * The on/off state of the antenna.
+   * You can turn the antenna off to save power.
+   * You must turn the antenna on in order to detect and read RFID tags.
+   */
+  rb_define_method(ph_rfid, "getAntennaEnabled", ph_rfid_get_antenna_enabled, 0);
+  rb_define_alias(ph_rfid, "antenna_enabled?", "getAntennaEnabled");
 
-int ph_rfid_on_output_change(CPhidgetRFIDHandle phid, void *userPtr, int index, int state) {
-  ph_callback_data_t *callback_data = ((ph_callback_data_t *)userPtr);
-  callback_data->called = true;
-  return EPHIDGET_OK;
+  /* Document-method: setAntennaEnabled
+   * call-seq: setAntennaEnabled(state)
+   *
+   * The on/off state of the antenna.
+   * You can turn the antenna off to save power.
+   * You must turn the antenna on in order to detect and read RFID tags.
+   */
+  rb_define_method(ph_rfid, "setAntennaEnabled", ph_rfid_set_antenna_enabled, 1);
+  rb_define_alias(ph_rfid, "antenna_enabled=", "setAntennaEnabled");
+
+  /* Document-method: getLastTag
+   * call-seq: getLastTag -> tag
+   *
+   * Gets the most recently read tag's data, even if that tag is no longer within read range.
+   * Only valid after at least one tag has been read.
+   */
+  rb_define_method(ph_rfid, "getLastTag", ph_rfid_get_last_tag, 0);
+  rb_define_alias(ph_rfid, "last_tag", "getLastTag");
+
+  /* Document-method: getTagPresent
+   * call-seq: getTagPresent -> true or false
+   *
+   * This property is true if a compatibile RFID tag is being read by the reader.
+   * TagPresent will remain true until the tag is out of range and can no longer be read.
+   */
+  rb_define_method(ph_rfid, "getTagPresent", ph_rfid_get_tag_present, 0);
+  rb_define_alias(ph_rfid, "tag_present?", "getTagPresent");
+
+  /* Document-method: write
+   * call-seq: write(tag, protocol, lock)
+   *
+   * Writes data to the tag being currently read by the reader.
+   * You cannot write to a read-only or locked tag.
+   */
+  rb_define_method(ph_rfid, "write", ph_rfid_write, 3);
+
+  rb_define_private_method(ph_rfid, "ext_setOnTagHandler", ph_rfid_set_on_tag_handler, 1);
+  rb_define_private_method(ph_rfid, "ext_setOnTagLostHandler", ph_rfid_set_on_tag_lost_handler, 1);
 }
-#endif