diff options
| author | Jonathan McCrohan <jmccrohan@gmail.com> | 2013-03-03 20:04:36 +0000 |
|---|---|---|
| committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2013-03-03 20:04:36 +0000 |
| commit | 571d570e1be6f783a2e8ef0dafa838e9d82f923e (patch) | |
| tree | 9b18682751acba56d650129922ecc4c5f12a3469 /labview/phidget_labview.c | |
| parent | 62172377c57ff85bce35a43e0ca3e76f67a473ad (diff) | |
| parent | 4e6290d8e2dc4dcd784102bdab18d7e1854e11c0 (diff) | |
| download | libphidget21-squeeze-backports.tar.gz | |
Merge branch 'master' into squeeze-backportssqueeze-backports
Conflicts:
debian/changelog
Diffstat (limited to 'labview/phidget_labview.c')
| -rw-r--r-- | labview/phidget_labview.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/labview/phidget_labview.c b/labview/phidget_labview.c index 380915b..64f6cae 100644 --- a/labview/phidget_labview.c +++ b/labview/phidget_labview.c @@ -140,23 +140,12 @@ LV_CFHANDLE_BODY(RFID, TagLost, lvUInt8Array, void *userPtr, unsigned char *val1 DSDisposePtr(data);
return EPHIDGET_OK;
}
-LV_CFHANDLE_BODY(RFID, RawData, lvInt32Array, void *userPtr, int *val1, int val2)
- data->val1=(lvArrInt32DH)DSNewHandle(sizeof(int32)+val2*sizeof(int32));
- (*(data->val1))->length = val2;
- memcpy((*(data->val1))->data, val1, val2 * sizeof(int32));
-
- ret = PostLVUserEvent(ev, data);
-
- DSDisposeHandle(data->val1);
- DSDisposePtr(data);
- return EPHIDGET_OK;
-}
-LV_CFHANDLE_BODY(RFID, TagAdvanced, lvRFIDTagAdvanced, void *userPtr, char *val1, CPhidgetRFID_TagInfoHandle val2)
+LV_CFHANDLE_BODY(RFID, Tag2, lvRFIDTag2, void *userPtr, char *val1, CPhidgetRFID_Protocol val2)
data->val1=(LStrHandle)DSNewHandle(sizeof(int32)+255*sizeof(char));
memset(LStrBuf(*data->val1),'\0',255);
snprintf((char*)LStrBuf(*data->val1),255,"%s",val1);
LStrLen(*data->val1)=strlen(val1);
- data->val2 = *val2;
+ data->val2 = val2;
ret = PostLVUserEvent(ev, data);
@@ -164,12 +153,12 @@ LV_CFHANDLE_BODY(RFID, TagAdvanced, lvRFIDTagAdvanced, void *userPtr, char *val1 DSDisposePtr(data);
return EPHIDGET_OK;
}
-LV_CFHANDLE_BODY(RFID, TagLostAdvanced, lvRFIDTagAdvanced, void *userPtr, char *val1, CPhidgetRFID_TagInfoHandle val2)
+LV_CFHANDLE_BODY(RFID, TagLost2, lvRFIDTag2, void *userPtr, char *val1, CPhidgetRFID_Protocol val2)
data->val1=(LStrHandle)DSNewHandle(sizeof(int32)+255*sizeof(char));
memset(LStrBuf(*data->val1),'\0',255);
snprintf((char*)LStrBuf(*data->val1),255,"%s",val1);
LStrLen(*data->val1)=strlen(val1);
- data->val2 = *val2;
+ data->val2 = val2;
ret = PostLVUserEvent(ev, data);
@@ -397,9 +386,8 @@ LV_NULL_FUNC(PHSensor, PHChange) LV_NULL_FUNC(RFID, OutputChange)
LV_NULL_FUNC(RFID, Tag)
LV_NULL_FUNC(RFID, TagLost)
-LV_NULL_FUNC(RFID, RawData)
-LV_NULL_FUNC(RFID, TagAdvanced)
-LV_NULL_FUNC(RFID, TagLostAdvanced)
+LV_NULL_FUNC(RFID, Tag2)
+LV_NULL_FUNC(RFID, TagLost2)
LV_NULL_FUNC(Servo, PositionChange)
|