phidgets 0.1.3 → 1.0.0

data/ext/phidgets/phidgets_temp_sensor.c

@@ -1,27 +1,117 @@
 
 #include "phidgets.h"
 
+#define TEMP_SENSOR_TEMPERATURE_CHANGE_CALLBACK  0
 
-VALUE ph_temp_init(VALUE self);
-VALUE ph_temp_get_temperature_input_count(VALUE self);
-VALUE ph_temp_get_temperature(VALUE self, VALUE index);
-VALUE ph_temp_get_temperature_min(VALUE self, VALUE index);
-VALUE ph_temp_get_temperature_max(VALUE self, VALUE index);
-VALUE ph_temp_get_temperature_change_trigger(VALUE self, VALUE index);
-VALUE ph_temp_set_temperature_change_trigger(VALUE self, VALUE index, VALUE temperature);
-VALUE ph_temp_get_potential(VALUE self, VALUE index);
-VALUE ph_temp_get_potential_min(VALUE self, VALUE index);
-VALUE ph_temp_get_potential_max(VALUE self, VALUE index);
-VALUE ph_temp_get_ambient_temperature(VALUE self);
-VALUE ph_temp_get_ambient_temperature_min(VALUE self);
-VALUE ph_temp_get_ambient_temperature_max(VALUE self);
-VALUE ph_temp_get_thermocouple_type(VALUE self, VALUE index);
-VALUE ph_temp_set_thermocouple_type(VALUE self, VALUE index, VALUE thermocouple);
-
-#ifdef PH_CALLBACK
-VALUE ph_temp_set_on_temperature_change_handler(VALUE self, VALUE handler);
-int ph_temp_on_temperature_change(CPhidgetTemperatureSensorHandle phid, void *userPtr, int index, double temperature);
-#endif
+
+VALUE ph_temp_init(VALUE self) {
+  ph_data_t *ph = get_ph_data(self);
+  ph_raise(PhidgetTemperatureSensor_create((PhidgetTemperatureSensorHandle *)(&(ph->handle))));
+  return self;
+}
+
+VALUE ph_temp_get_data_interval(VALUE self) {
+  return ph_get_uint(get_ph_handle(self), (phidget_get_uint_func)PhidgetTemperatureSensor_getDataInterval);
+}
+
+VALUE ph_temp_set_data_interval(VALUE self, VALUE interval) {
+  ph_raise(PhidgetTemperatureSensor_setDataInterval((PhidgetTemperatureSensorHandle)get_ph_handle(self), NUM2UINT(interval)));
+  return Qnil;
+}
+
+VALUE ph_temp_get_min_data_interval(VALUE self) {
+  return ph_get_uint(get_ph_handle(self), (phidget_get_uint_func)PhidgetTemperatureSensor_getMinDataInterval);
+}
+
+VALUE ph_temp_get_max_data_interval(VALUE self) {
+  return ph_get_uint(get_ph_handle(self), (phidget_get_uint_func)PhidgetTemperatureSensor_getMaxDataInterval);
+}
+
+VALUE ph_temp_get_rtd_type(VALUE self) {
+  return ph_get_int(get_ph_handle(self), (phidget_get_int_func)PhidgetTemperatureSensor_getRTDType);
+}
+
+VALUE ph_temp_set_rtd_type(VALUE self, VALUE rtd_type) {
+  ph_raise(PhidgetTemperatureSensor_setRTDType((PhidgetTemperatureSensorHandle)get_ph_handle(self), NUM2INT(rtd_type)));
+  return Qnil;
+}
+
+VALUE ph_temp_get_rtd_wire_setup(VALUE self) {
+  return ph_get_int(get_ph_handle(self), (phidget_get_int_func)PhidgetTemperatureSensor_getRTDWireSetup);
+}
+
+VALUE ph_temp_set_rtd_wire_setup(VALUE self, VALUE wire_setup) {
+  ph_raise(PhidgetTemperatureSensor_setRTDWireSetup((PhidgetTemperatureSensorHandle)get_ph_handle(self), NUM2INT(wire_setup)));
+  return Qnil;
+}
+
+VALUE ph_temp_get_temperature(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetTemperatureSensor_getTemperature);
+}
+
+VALUE ph_temp_get_min_temperature(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetTemperatureSensor_getMinTemperature);
+}
+
+VALUE ph_temp_get_max_temperature(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetTemperatureSensor_getMaxTemperature);
+}
+
+VALUE ph_temp_get_temperature_change_trigger(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetTemperatureSensor_getTemperatureChangeTrigger);
+}
+
+VALUE ph_temp_set_temperature_change_trigger(VALUE self, VALUE temperature) {
+  ph_raise(PhidgetTemperatureSensor_setTemperatureChangeTrigger((PhidgetTemperatureSensorHandle)get_ph_handle(self), NUM2DBL(temperature)));
+  return Qnil;
+}
+
+VALUE ph_temp_get_min_temperature_change_trigger(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetTemperatureSensor_getMinTemperatureChangeTrigger);
+}
+
+VALUE ph_temp_get_max_temperature_change_trigger(VALUE self) {
+  return ph_get_double(get_ph_handle(self), (phidget_get_double_func)PhidgetTemperatureSensor_getMaxTemperatureChangeTrigger);
+}
+
+VALUE ph_temp_get_thermocouple_type(VALUE self) {
+  return ph_get_int(get_ph_handle(self), (phidget_get_int_func)PhidgetTemperatureSensor_getThermocoupleType);
+}
+
+VALUE ph_temp_set_thermocouple_type(VALUE self, VALUE type) {
+  ph_raise(PhidgetTemperatureSensor_setThermocoupleType((PhidgetTemperatureSensorHandle)get_ph_handle(self), (PhidgetTemperatureSensor_ThermocoupleType)NUM2INT(type)));
+  return Qnil;
+}
+
+
+void CCONV ph_temp_on_temperature_change(PhidgetTemperatureSensorHandle phid, void *userPtr, double temperature) {
+  ph_callback_data_t *callback_data = ((ph_callback_data_t *)userPtr);
+  while(sem_wait(&callback_data->handler_ready)!=0) {};
+  callback_data->arg1 = DBL2NUM(temperature);
+  callback_data->arg2 = Qnil;
+  callback_data->arg3 = Qnil;
+  callback_data->arg4 = Qnil;
+  sem_post(&callback_data->callback_called);
+}
+
+
+VALUE ph_temp_set_on_temperature_change_handler(VALUE self, VALUE handler) {
+  ph_data_t *ph = get_ph_data(self);
+  ph_callback_data_t *callback_data = &ph->dev_callbacks[TEMP_SENSOR_TEMPERATURE_CHANGE_CALLBACK];
+  if( TYPE(handler) == T_NIL ) {
+    callback_data->callback = T_NIL;
+    callback_data->exit = true;
+    ph_raise(PhidgetTemperatureSensor_setOnTemperatureChangeHandler((PhidgetTemperatureSensorHandle)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(PhidgetTemperatureSensor_setOnTemperatureChangeHandler((PhidgetTemperatureSensorHandle)ph->handle, ph_temp_on_temperature_change, (void *)callback_data));
+    ph_callback_thread(callback_data);
+  }
+  return Qnil;
+}
 
 
 void Init_temperature_sensor() {
@@ -29,10 +119,15 @@ void Init_temperature_sensor() {
   VALUE ph_common = rb_const_get(ph_module, rb_intern("Common"));
   VALUE ph_temp = rb_define_class_under(ph_module, "TemperatureSensor", ph_common);
 
-  rb_define_const(ph_temp, "K_TYPE", INT2FIX(PHIDGET_TEMPERATURE_SENSOR_K_TYPE));
-  rb_define_const(ph_temp, "J_TYPE", INT2FIX(PHIDGET_TEMPERATURE_SENSOR_J_TYPE));
-  rb_define_const(ph_temp, "E_TYPE", INT2FIX(PHIDGET_TEMPERATURE_SENSOR_E_TYPE));
-  rb_define_const(ph_temp, "T_TYPE", INT2FIX(PHIDGET_TEMPERATURE_SENSOR_T_TYPE));
+  rb_define_const(ph_temp, "RTD_TYPE_PT100_3850", INT2NUM(RTD_TYPE_PT100_3850));
+  rb_define_const(ph_temp, "RTD_TYPE_PT1000_3850", INT2NUM(RTD_TYPE_PT1000_3850));
+  rb_define_const(ph_temp, "RTD_TYPE_PT100_3920", INT2NUM(RTD_TYPE_PT100_3920));
+  rb_define_const(ph_temp, "RTD_TYPE_PT1000_3920", INT2NUM(RTD_TYPE_PT1000_3920));
+
+  rb_define_const(ph_temp, "THERMOCOUPLE_TYPE_K", INT2NUM(THERMOCOUPLE_TYPE_K));
+  rb_define_const(ph_temp, "THERMOCOUPLE_TYPE_J", INT2NUM(THERMOCOUPLE_TYPE_J));
+  rb_define_const(ph_temp, "THERMOCOUPLE_TYPE_E", INT2NUM(THERMOCOUPLE_TYPE_E));
+  rb_define_const(ph_temp, "THERMOCOUPLE_TYPE_T", INT2NUM(THERMOCOUPLE_TYPE_T));
 
   /* Document-method: new
    * call-seq: new
@@ -41,255 +136,155 @@ void Init_temperature_sensor() {
    */
   rb_define_method(ph_temp, "initialize", ph_temp_init, 0);
 
-  /* Document-method: getTemperatureInputCount
-   * call-seq: getTemperatureInputCount -> count
+  /* Document-method: getDataInterval
+   * call-seq: getDataInterval -> interval
    *
-   * Gets the number of thermocouple inputs supported by this board.
+   * The DataInterval is the time that must elapse before the channel will fire another TemperatureChange event.
+   * The data interval is bounded by MinDataInterval and MaxDataInterval.
+   * The timing between TemperatureChange events can also affected by the TemperatureChangeTrigger.
    */
-  rb_define_method(ph_temp, "getTemperatureInputCount", ph_temp_get_temperature_input_count, 0);
+  rb_define_method(ph_temp, "getDataInterval", ph_temp_get_data_interval, 0);
+  rb_define_alias(ph_temp, "data_interval", "getDataInterval");
 
-  /* Document-method: getTemperature
-   * call-seq: getTemperature(index) -> temperature
+  /* Document-method: setDataInterval
+   * call-seq: setDataInterval(interval)
    *
-   * Gets the temperature measured by a thermocouple input.
+   * The DataInterval is the time that must elapse before the channel will fire another TemperatureChange event.
+   * The data interval is bounded by MinDataInterval and MaxDataInterval.
+   * The timing between TemperatureChange events can also affected by the TemperatureChangeTrigger.
    */
-  rb_define_method(ph_temp, "getTemperature", ph_temp_get_temperature, 1);
+  rb_define_method(ph_temp, "setDataInterval", ph_temp_set_data_interval, 1);
+  rb_define_alias(ph_temp, "data_interval=", "setDataInterval");
 
-  /* Document-method: getTemperatureMin
-   * call-seq: getTemperatureMin(index) -> temperature
+  /* Document-method: getMinDataInterval
+   * call-seq: getMinDataInterval -> interval
    *
-   * Gets the minimum temperature that can be measured by a thermocouple input. This depends on the type
-   * of thermocouple attached, as well as the ambient temperature.
+   * The minimum value that DataInterval can be set to.
    */
-  rb_define_method(ph_temp, "getTemperatureMin", ph_temp_get_temperature_min, 1);
+  rb_define_method(ph_temp, "getMinDataInterval", ph_temp_get_min_data_interval, 0);
+  rb_define_alias(ph_temp, "min_data_interval", "getMinDataInterval");
 
-  /* Document-method: getTemperatureMax
-   * call-seq: getTemperatureMax(index) -> temperature
+  /* Document-method: getMaxDataInterval
+   * call-seq: getMaxDataInterval -> interval
    *
-   * Gets the maximum temperature that can be measured by a thermocouple input. This depends on the type
-   * of thermocouple attached, as well as the ambient temperature.
+   * The maximum value that DataInterval can be set to.
    */
-  rb_define_method(ph_temp, "getTemperatureMax", ph_temp_get_temperature_max, 1);
+  rb_define_method(ph_temp, "getMaxDataInterval", ph_temp_get_max_data_interval, 0);
+  rb_define_alias(ph_temp, "max_data_interval", "getMaxDataInterval");
 
-  /* Document-method: getTemperatureChangeTrigger
-   * call-seq: getTemperatureChangeTrigger(index) -> trigger
+  /* Document-method: getRTDType
+   * call-seq: getRTDType -> rtd_type
    *
-   * Gets the change trigger for a thermocouple input.
+   * The RTDType must correspond to the RTD type you are using in your application.
+   * If you are unsure which RTDType to use, visit your device's User Guide for more information.
    */
-  rb_define_method(ph_temp, "getTemperatureChangeTrigger", ph_temp_get_temperature_change_trigger, 1);
+  rb_define_method(ph_temp, "getRTDType", ph_temp_get_rtd_type, 0);
+  rb_define_alias(ph_temp, "rtd_type", "getRTDType");
 
-  /* Document-method: setTemperatureChangeTrigger
-   * call-seq: setTemperatureChangeTrigger(index, trigger)
+  /* Document-method: setRTDType
+   * call-seq: setRTDType(rtd_type)
    *
-   * Sets the change trigger for a thermocouple input.
+   * The RTDType must correspond to the RTD type you are using in your application.
+   * If you are unsure which RTDType to use, visit your device's User Guide for more information.
    */
-  rb_define_method(ph_temp, "setTemperatureChangeTrigger", ph_temp_set_temperature_change_trigger, 2);
+  rb_define_method(ph_temp, "setRTDType", ph_temp_set_rtd_type, 1);
+  rb_define_alias(ph_temp, "rtd_type=", "setRTDType");
 
-  /* Document-method: getPotential
-   * call-seq: getPotential(index) -> potential
+  /* Document-method: getRTDWireSetup
+   * call-seq: getRTDWireSetup -> wire_setup
    *
-   * Gets the currently sensed potential for a thermocouple input.
+   * The RTDWireSetup must correspond to the wire configuration you are using in your application.
+   * If you are unsure which RTDWireSetup to use, visit your device's User Guide for more information.
    */
-  rb_define_method(ph_temp, "getPotential", ph_temp_get_potential, 1);
+  rb_define_method(ph_temp, "getRTDWireSetup", ph_temp_get_rtd_wire_setup, 0);
+  rb_define_alias(ph_temp, "rtd_wire_setup", "getRTDWireSetup");
 
-  /* Document-method: getPotentialMin
-   * call-seq: getPotentialMin(index) -> potential
+  /* Document-method: setRTDWireSetup
+   * call-seq: setRTDWireSetup(wire_setup)
    *
-   * Gets the minimum potential that a thermocouple input can measure.
+   * The RTDWireSetup must correspond to the wire configuration you are using in your application.
+   * If you are unsure which RTDWireSetup to use, visit your device's User Guide for more information.
    */
-  rb_define_method(ph_temp, "getPotentialMin", ph_temp_get_potential_min, 1);
+  rb_define_method(ph_temp, "setRTDWireSetup", ph_temp_set_rtd_wire_setup, 1);
+  rb_define_alias(ph_temp, "rtd_wire_setup=", "setRTDWireSetup");
 
-  /* Document-method: getPotentialMax
-   * call-seq: getPotentialMax(index) -> potential
+  /* Document-method: getTemperature
+   * call-seq: getTemperature -> temperature
    *
-   * Gets the maximum potential that a thermocouple input can measure.
+   * The most recent temperature value that the channel has reported.
+   * This value will always be between MinTemperature and MaxTemperature.
    */
-  rb_define_method(ph_temp, "getPotentialMax", ph_temp_get_potential_max, 1);
+  rb_define_method(ph_temp, "getTemperature", ph_temp_get_temperature, 0);
+  rb_define_alias(ph_temp, "temperature", "getTemperature");
 
-  /* Document-method: getAmbientTemperature
-   * call-seq: getAmbientTemperature -> temperature
+  /* Document-method: getMinTemperature
+   * call-seq: getMinTemperature -> temperature
    *
-   * Gets the ambient (board) temperature.
+   * The minimum value the TemperatureChange event will report.
    */
-  rb_define_method(ph_temp, "getAmbientTemperature", ph_temp_get_ambient_temperature, 0);
+  rb_define_method(ph_temp, "getMinTemperature", ph_temp_get_min_temperature, 0);
+  rb_define_alias(ph_temp, "min_temperature", "getMinTemperature");
 
-  /* Document-method: getAmbientTemperatureMin
-   * call-seq: getAmbientTemperatureMin -> temperature
+  /* Document-method: getMaxTemperature
+   * call-seq: getMaxTemperature -> temperature
    *
-   * Gets the minimum temperature that the ambient onboard temperature sensor can measure.
+   * The maximum value the TemperatureChange event will report.
    */
-  rb_define_method(ph_temp, "getAmbientTemperatureMin", ph_temp_get_ambient_temperature_min, 0);
+  rb_define_method(ph_temp, "getMaxTemperature", ph_temp_get_max_temperature, 0);
+  rb_define_alias(ph_temp, "max_temperature", "getMaxTemperature");
 
-  /* Document-method: getAmbientTemperatureMax
-   * call-seq: getAmbientTemperatureMax -> temperature
+  /* Document-method: getTemperatureChangeTrigger
+   * call-seq: getTemperatureChangeTrigger -> trigger
    *
-   * Gets the maximum temperature that the ambient onboard temperature sensor can measure.
+   * The channel will not issue a TemperatureChange event until the temperature value has changed by the amount specified by the TemperatureChangeTrigger.
+   * Setting the TemperatureChangeTrigger 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_temp, "getAmbientTemperatureMax", ph_temp_get_ambient_temperature_max, 0);
+  rb_define_method(ph_temp, "getTemperatureChangeTrigger", ph_temp_get_temperature_change_trigger, 0);
+  rb_define_alias(ph_temp, "temperature_change_trigger", "getTemperatureChangeTrigger");
 
-  /* Document-method: getThermocoupleType
-   * call-seq: getThermocoupleType(index) -> type
+  /* Document-method: setTemperatureChangeTrigger
+   * call-seq: setTemperatureChangeTrigger(trigger)
    *
-   * Gets the type of thermocouple set to be at a thermocouple input. By default this is K-Type.
+   * The channel will not issue a TemperatureChange event until the temperature value has changed by the amount specified by the TemperatureChangeTrigger.
+   * Setting the TemperatureChangeTrigger 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_temp, "getThermocoupleType", ph_temp_get_thermocouple_type, 1);
+  rb_define_method(ph_temp, "setTemperatureChangeTrigger", ph_temp_set_temperature_change_trigger, 1);
+  rb_define_alias(ph_temp, "temperature_change_trigger=", "setTemperatureChangeTrigger");
 
-  /* Document-method: setThermocoupleType
-   * call-seq: setThermocoupleType(index, type)
+  /* Document-method: getMinTemperatureChangeTrigger
+   * call-seq: getMinTemperatureChangeTrigger -> trigger
    *
-   * Sets the type of thermocouple plugged into a thermocouple input. By default this is K-Type.
+   * The minimum value that TemperatureChangeTrigger can be set to.
    */
-  rb_define_method(ph_temp, "setThermocoupleType", ph_temp_set_thermocouple_type, 2);
+  rb_define_method(ph_temp, "getMinTemperatureChangeTrigger", ph_temp_get_min_temperature_change_trigger, 0);
+  rb_define_alias(ph_temp, "min_temperature_change_trigger", "getMinTemperatureChangeTrigger");
 
-#ifdef PH_CALLBACK
-  rb_define_private_method(ph_temp, "ext_setOnTemperatureChangeHandler", ph_temp_set_on_temperature_change_handler, 1);
-#endif
+  /* Document-method: getMaxTemperatureChangeTrigger
+   * call-seq: getMaxTemperatureChangeTrigger -> trigger
+   *
+   * The maximum value that TemperatureChangeTrigger can be set to.
+   */
+  rb_define_method(ph_temp, "getMaxTemperatureChangeTrigger", ph_temp_get_max_temperature_change_trigger, 0);
+  rb_define_alias(ph_temp, "max_temperature_change_trigger", "getMaxTemperatureChangeTrigger");
 
-  rb_define_alias(ph_temp, "temperature_input_count", "getTemperatureInputCount");
-  rb_define_alias(ph_temp, "temperature", "getTemperature");
-  rb_define_alias(ph_temp, "temperature_min", "getTemperatureMin");
-  rb_define_alias(ph_temp, "temperature_max", "getTemperatureMax");
-  rb_define_alias(ph_temp, "temperature_change_trigger", "getTemperatureChangeTrigger");
-  rb_define_alias(ph_temp, "set_temperature_change_trigger", "setTemperatureChangeTrigger");
-  rb_define_alias(ph_temp, "potential", "getPotential");
-  rb_define_alias(ph_temp, "potential_min", "getPotentialMin");
-  rb_define_alias(ph_temp, "potential_max", "getPotentialMax");
-  rb_define_alias(ph_temp, "ambient_temperature", "getAmbientTemperature");
-  rb_define_alias(ph_temp, "ambient_temperature_min", "getAmbientTemperatureMin");
-  rb_define_alias(ph_temp, "ambient_temperature_max", "getAmbientTemperatureMax");
+  /* Document-method: getThermocoupleType
+   * call-seq: getThermocoupleType -> type
+   *
+   * The ThermocoupleType must correspond to the thermocouple type you are using in your application.
+   * If you are unsure which ThermocoupleType to use, visit the Thermocouple Primer for more information.
+   */
+  rb_define_method(ph_temp, "getThermocoupleType", ph_temp_get_thermocouple_type, 0);
   rb_define_alias(ph_temp, "thermocouple_type", "getThermocoupleType");
-  rb_define_alias(ph_temp, "set_thermocouple_type", "setThermocoupleType");
-}
-
-
-
-VALUE ph_temp_init(VALUE self) {
-  ph_data_t *ph = get_ph_data(self);
-  ph_raise(CPhidgetTemperatureSensor_create((CPhidgetTemperatureSensorHandle *)(&(ph->handle))));
-  return self;
-}
-
-VALUE ph_temp_get_temperature_input_count(VALUE self) {
-  CPhidgetTemperatureSensorHandle handle = (CPhidgetTemperatureSensorHandle)get_ph_handle(self);
-  int count;
-  ph_raise(CPhidgetTemperatureSensor_getTemperatureInputCount(handle, &count));
-  return INT2FIX(count);
-}
-
-VALUE ph_temp_get_temperature(VALUE self, VALUE index) {
-  CPhidgetTemperatureSensorHandle handle = (CPhidgetTemperatureSensorHandle)get_ph_handle(self);
-  double temperature;
-  ph_raise(CPhidgetTemperatureSensor_getTemperature(handle, FIX2INT(index), &temperature));
-  return rb_float_new(temperature);
-}
-
-VALUE ph_temp_get_temperature_min(VALUE self, VALUE index) {
-  CPhidgetTemperatureSensorHandle handle = (CPhidgetTemperatureSensorHandle)get_ph_handle(self);
-  double temperature;
-  ph_raise(CPhidgetTemperatureSensor_getTemperatureMin(handle, FIX2INT(index), &temperature));
-  return rb_float_new(temperature);
-}
-
-VALUE ph_temp_get_temperature_max(VALUE self, VALUE index) {
-  CPhidgetTemperatureSensorHandle handle = (CPhidgetTemperatureSensorHandle)get_ph_handle(self);
-  double temperature;
-  ph_raise(CPhidgetTemperatureSensor_getTemperatureMax(handle, FIX2INT(index), &temperature));
-  return rb_float_new(temperature);
-}
-
-VALUE ph_temp_get_temperature_change_trigger(VALUE self, VALUE index) {
-  CPhidgetTemperatureSensorHandle handle = (CPhidgetTemperatureSensorHandle)get_ph_handle(self);
-  double temperature;
-  ph_raise(CPhidgetTemperatureSensor_getTemperatureChangeTrigger(handle, FIX2INT(index), &temperature));
-  return rb_float_new(temperature);
-}
-
-VALUE ph_temp_set_temperature_change_trigger(VALUE self, VALUE index, VALUE temperature) {
-  CPhidgetTemperatureSensorHandle handle = (CPhidgetTemperatureSensorHandle)get_ph_handle(self);
-  ph_raise(CPhidgetTemperatureSensor_setTemperatureChangeTrigger(handle, FIX2INT(index), NUM2DBL(temperature)));
-  return Qnil;
-}
-
-VALUE ph_temp_get_potential(VALUE self, VALUE index) {
-  CPhidgetTemperatureSensorHandle handle = (CPhidgetTemperatureSensorHandle)get_ph_handle(self);
-  double potential;
-  ph_raise(CPhidgetTemperatureSensor_getPotential(handle, FIX2INT(index), &potential));
-  return rb_float_new(potential);
-}
-
-VALUE ph_temp_get_potential_min(VALUE self, VALUE index) {
-  CPhidgetTemperatureSensorHandle handle = (CPhidgetTemperatureSensorHandle)get_ph_handle(self);
-  double potential;
-  ph_raise(CPhidgetTemperatureSensor_getPotentialMin(handle, FIX2INT(index), &potential));
-  return rb_float_new(potential);
-}
-
-VALUE ph_temp_get_potential_max(VALUE self, VALUE index) {
-  CPhidgetTemperatureSensorHandle handle = (CPhidgetTemperatureSensorHandle)get_ph_handle(self);
-  double potential;
-  ph_raise(CPhidgetTemperatureSensor_getPotentialMax(handle, FIX2INT(index), &potential));
-  return rb_float_new(potential);
-}
-
-VALUE ph_temp_get_ambient_temperature(VALUE self) {
-  CPhidgetTemperatureSensorHandle handle = (CPhidgetTemperatureSensorHandle)get_ph_handle(self);
-  double temperature;
-  ph_raise(CPhidgetTemperatureSensor_getAmbientTemperature(handle, &temperature));
-  return rb_float_new(temperature);
-}
-
-VALUE ph_temp_get_ambient_temperature_min(VALUE self) {
-  CPhidgetTemperatureSensorHandle handle = (CPhidgetTemperatureSensorHandle)get_ph_handle(self);
-  double temperature;
-  ph_raise(CPhidgetTemperatureSensor_getAmbientTemperatureMin(handle, &temperature));
-  return rb_float_new(temperature);
-}
-
-VALUE ph_temp_get_ambient_temperature_max(VALUE self) {
-  CPhidgetTemperatureSensorHandle handle = (CPhidgetTemperatureSensorHandle)get_ph_handle(self);
-  double temperature;
-  ph_raise(CPhidgetTemperatureSensor_getAmbientTemperatureMax(handle, &temperature));
-  return rb_float_new(temperature);
-}
-
-VALUE ph_temp_get_thermocouple_type(VALUE self, VALUE index) {
-  CPhidgetTemperatureSensorHandle handle = (CPhidgetTemperatureSensorHandle)get_ph_handle(self);
-  CPhidgetTemperatureSensor_ThermocoupleType type;
-  ph_raise(CPhidgetTemperatureSensor_getThermocoupleType(handle, FIX2INT(index), &type));
-  return INT2FIX(type);
-}
-
-VALUE ph_temp_set_thermocouple_type(VALUE self, VALUE index, VALUE type) {
-  CPhidgetTemperatureSensorHandle handle = (CPhidgetTemperatureSensorHandle)get_ph_handle(self);
-  ph_raise(CPhidgetTemperatureSensor_setThermocoupleType(handle, FIX2INT(index), (CPhidgetTemperatureSensor_ThermocoupleType)FIX2INT(type)));
-  return Qnil;
-}
-
-
-#ifdef PH_CALLBACK
-VALUE ph_temp_set_on_temperature_change_handler(VALUE self, VALUE handler) {
-  ph_data_t *ph = get_ph_data(self);
-  ph_callback_data_t *callback_data = &ph->dev_callback_1;
-  if( TYPE(handler) == T_NIL ) {
-    callback_data->exit = true;
-    ph_raise(CPhidgetTemperatureSensor_set_OnTemperatureChange_Handler((CPhidgetTemperatureSensorHandle)ph->handle, NULL, (void *)NULL));
-  } else {
-    callback_data->called = false;
-    callback_data->exit = false;
-    callback_data->phidget = self;
-    callback_data->callback = handler;
-    ph_raise(CPhidgetTemperatureSensor_set_OnTemperatureChange_Handler((CPhidgetTemperatureSensorHandle)ph->handle, ph_temp_on_temperature_change, (void *)callback_data));
-    ph_callback_thread(callback_data);
-  }
-  return Qnil;
-}
 
+  /* Document-method: setThermocoupleType
+   * call-seq: setThermocoupleType(type)
+   *
+   * The ThermocoupleType must correspond to the thermocouple type you are using in your application.
+   * If you are unsure which ThermocoupleType to use, visit the Thermocouple Primer for more information.
+   */
+  rb_define_method(ph_temp, "setThermocoupleType", ph_temp_set_thermocouple_type, 1);
+  rb_define_alias(ph_temp, "thermocouple_type=", "setThermocoupleType");
 
-int ph_temp_on_temperature_change(CPhidgetTemperatureSensorHandle phid, void *userPtr, int index, double temperature) {
-  ph_callback_data_t *callback_data = ((ph_callback_data_t *)userPtr);
-  callback_data->called = true;
-  return EPHIDGET_OK;
+  rb_define_private_method(ph_temp, "ext_setOnTemperatureChangeHandler", ph_temp_set_on_temperature_change_handler, 1);
 }
 
-#endif
-