diff options
author | Jonathan McCrohan <jmccrohan@gmail.com> | 2013-03-03 19:30:43 +0000 |
---|---|---|
committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2013-03-03 19:30:43 +0000 |
commit | 477e8e9570cebe9152c011a76defd6e9ce21fac7 (patch) | |
tree | 257399dd5eb402a14de37452069e080662c5c1c3 /cphidgetattr.h | |
parent | 827093b9a63335655c696d4beb3134613c4414e6 (diff) | |
parent | 46bd2ba42d186a81d7ad7e4a55e03dd63b2d042f (diff) | |
download | libphidget21-477e8e9570cebe9152c011a76defd6e9ce21fac7.tar.gz |
Merge tag 'upstream/2.1.8.20121218'
Upstream version 2.1.8.20121218
Diffstat (limited to '')
-rw-r--r-- | cphidgetattr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cphidgetattr.h b/cphidgetattr.h index 0a3c884..f54c403 100644 --- a/cphidgetattr.h +++ b/cphidgetattr.h @@ -212,6 +212,7 @@ typedef enum { PHIDID_MOTORCONTROL_1MOTOR = 0x03E, /**< Phidget 1 Motor Motor Controller (1065) */ PHIDID_MOTORCONTROL_HC_2MOTOR = 0x059, /**< Phidget 2 Motor High Current Motor Controller (1064) */ PHIDID_RFID_2OUTPUT = 0x031, /**< Phidget RFID with Digital Outputs and Onboard LED (1023) */ + PHIDID_RFID_2OUTPUT_READ_WRITE = 0x034, /**< Phidget RFID with R/W support (1024) */ PHIDID_ROTARY_TOUCH = 0x077, /**< Phidget Rotary Touch (1016) */ PHIDID_SPATIAL_ACCEL_3AXIS = 0x07F, /**< Phidget Spatial 3-axis accel (1049, 1041, 1043) */ PHIDID_SPATIAL_ACCEL_GYRO_COMPASS = 0x033, /**< Phidget Spatial 3/3/3 (1056, 1042, 1044) */ @@ -253,7 +254,6 @@ typedef enum { PHIDID_INTERFACEKIT_2_8_8 = 5, /**< Phidget Interface Kit 2/8/8 */ /* These are unreleased or prototype devices */ - PHIDID_RFID_2OUTPUT_ADVANCED = 0x034, /**< Phidget RFID with R/W support (1024) */ /* This is for internal prototyping */ PHIDID_GENERIC = 0x099 @@ -325,7 +325,7 @@ typedef enum { PHIDUID_RFID, PHIDUID_RFID_2OUTPUT_NO_ECHO, PHIDUID_RFID_2OUTPUT, - PHIDUID_RFID_2OUTPUT_ADVANCED, + PHIDUID_RFID_2OUTPUT_READ_WRITE, PHIDUID_SERVO_1MOTOR_OLD, PHIDUID_SERVO_4MOTOR_OLD, |