aboutsummaryrefslogtreecommitdiffstats
path: root/cphidgetattr.h
diff options
context:
space:
mode:
authorJonathan McCrohan <jmccrohan@gmail.com>2013-03-03 19:30:43 +0000
committerJonathan McCrohan <jmccrohan@gmail.com>2013-03-03 19:30:43 +0000
commit46bd2ba42d186a81d7ad7e4a55e03dd63b2d042f (patch)
tree21c25e277606d6a711029c8d9511f57983cbc23b /cphidgetattr.h
parent8f3c91e91b634adaca77dac6cf314445cceefc78 (diff)
downloadlibphidget21-46bd2ba42d186a81d7ad7e4a55e03dd63b2d042f.tar.gz
Imported Upstream version 2.1.8.20121218upstream
Diffstat (limited to 'cphidgetattr.h')
-rw-r--r--cphidgetattr.h4
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,