diff options
| author | Jonathan McCrohan <jmccrohan@gmail.com> | 2012-10-19 19:38:06 +0100 |
|---|---|---|
| committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2012-10-19 19:38:06 +0100 |
| commit | 2891593727a0151a66ed7860fed6399548c74c02 (patch) | |
| tree | 1cb52da179b4ab23ba2a22f44d88ea3523f51f0c /phidget21.h | |
| parent | cff96463a694573a9f87b014482a45c25bf4c7b0 (diff) | |
| parent | 8f3c91e91b634adaca77dac6cf314445cceefc78 (diff) | |
| download | libphidget21-2891593727a0151a66ed7860fed6399548c74c02.tar.gz | |
Merge tag 'upstream/2.1.8.20120912'
Upstream version 2.1.8.20120912
Diffstat (limited to 'phidget21.h')
| -rw-r--r-- | phidget21.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phidget21.h b/phidget21.h index c9f62ea..6793b3f 100644 --- a/phidget21.h +++ b/phidget21.h @@ -138,6 +138,7 @@ typedef enum { PHIDUID_IR, PHIDUID_LED_64, PHIDUID_LED_64_ADV, + PHIDUID_LED_64_ADV_M3, PHIDUID_MOTORCONTROL_1MOTOR, PHIDUID_MOTORCONTROL_HC_2MOTOR, PHIDUID_MOTORCONTROL_LV_2MOTOR_4INPUT, @@ -161,6 +162,7 @@ typedef enum { PHIDUID_SPATIAL_ACCEL_GYRO_COMPASS_1042, PHIDUID_SPATIAL_ACCEL_GYRO_COMPASS_1044, PHIDUID_STEPPER_BIPOLAR_1MOTOR, + PHIDUID_STEPPER_BIPOLAR_1MOTOR_M3, PHIDUID_STEPPER_UNIPOLAR_4MOTOR, PHIDUID_TEMPERATURESENSOR_OLD, PHIDUID_TEMPERATURESENSOR, @@ -370,6 +372,7 @@ typedef struct _CPhidgetEncoder *CPhidgetEncoderHandle; int CPhidgetEncoder_getPosition(CPhidgetEncoderHandle phid, int index, int *position); int CPhidgetEncoder_setPosition(CPhidgetEncoderHandle phid, int index, int position); int CPhidgetEncoder_set_OnPositionChange_Handler(CPhidgetEncoderHandle phid, int ( *fptr)(CPhidgetEncoderHandle phid, void *userPtr, int index, int time,int positionChange), void *userPtr); + int CPhidgetEncoder_set_OnIndexChange_Handler(CPhidgetEncoderHandle phid, int ( *fptr)(CPhidgetEncoderHandle phid, void *userPtr, int index, int indexPosition), void *userPtr); int CPhidgetEncoder_getIndexPosition(CPhidgetEncoderHandle phid, int index, int *position); int CPhidgetEncoder_getEnabled(CPhidgetEncoderHandle phid, int index, int *enabledState); int CPhidgetEncoder_setEnabled(CPhidgetEncoderHandle phid, int index, int enabledState); |