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 /labview/phidget_labview.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-- | labview/phidget_labview.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/labview/phidget_labview.h b/labview/phidget_labview.h index fa96571..fff459d 100644 --- a/labview/phidget_labview.h +++ b/labview/phidget_labview.h @@ -255,13 +255,13 @@ typedef struct _lvIRLearn { } lvIRLearn;
/**
- * Used for Labview events that return an rfid tag (advanced)
+ * Used for Labview events that return an rfid tag (v2)
*/
-typedef struct _lvRFIDTagAdvanced {
- int32 nothing; /**< Not Used */
+typedef struct _lvRFIDTag2 {
LStrHandle val1; /**< Tag String */
- CPhidgetRFID_TagInfo val2; /**< tag properties */
-} lvRFIDTagAdvanced;
+ CPhidgetRFID_Protocol val2; /**< tag protocol */
+ int32 nothing; /**< Not Used */
+} lvRFIDTag2;
/**
* Used for Labview events that return spatial data
@@ -550,19 +550,19 @@ LV_CHDREVENT(RFID, TagLost) */
LV_CHDREVENT(RFID, RawData)
/**
- * Sets up a Labview event callback for the TagAdvanced event.
- * Event callback returns an \ref _lvRFIDTagAdvanced.
+ * Sets up a Labview event callback for the Tag2 event.
+ * Event callback returns an \ref _lvRFIDTag2.
* @param phid An attached phidget handle.
* @param lvEventRef Lavbiew user event ref
*/
-LV_CHDREVENT(RFID, TagAdvanced)
+LV_CHDREVENT(RFID, Tag2)
/**
- * Sets up a Labview event callback for the TagLostAdvanced event.
- * Event callback returns an \ref _lvRFIDTagAdvanced.
+ * Sets up a Labview event callback for the TagLost2 event.
+ * Event callback returns an \ref _lvRFIDTag2.
* @param phid An attached phidget handle.
* @param lvEventRef Lavbiew user event ref
*/
-LV_CHDREVENT(RFID, TagLostAdvanced)
+LV_CHDREVENT(RFID, TagLost2)
/**
* Sets up a Labview event callback for the PositionChange event.
|