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 /Java/com_phidgets_RFIDPhidget.h | |
| parent | 62172377c57ff85bce35a43e0ca3e76f67a473ad (diff) | |
| parent | 4e6290d8e2dc4dcd784102bdab18d7e1854e11c0 (diff) | |
| download | libphidget21-571d570e1be6f783a2e8ef0dafa838e9d82f923e.tar.gz | |
Merge branch 'master' into squeeze-backportssqueeze-backports
Conflicts:
debian/changelog
Diffstat (limited to 'Java/com_phidgets_RFIDPhidget.h')
| -rw-r--r-- | Java/com_phidgets_RFIDPhidget.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/Java/com_phidgets_RFIDPhidget.h b/Java/com_phidgets_RFIDPhidget.h index d6a123e..c136a58 100644 --- a/Java/com_phidgets_RFIDPhidget.h +++ b/Java/com_phidgets_RFIDPhidget.h @@ -151,6 +151,12 @@ extern "C" { #define com_phidgets_RFIDPhidget_PHIDCLASS_TEXTLED 16L #undef com_phidgets_RFIDPhidget_PHIDCLASS_WEIGHTSENSOR #define com_phidgets_RFIDPhidget_PHIDCLASS_WEIGHTSENSOR 17L +#undef com_phidgets_RFIDPhidget_PHIDGET_RFID_PROTOCOL_EM4100 +#define com_phidgets_RFIDPhidget_PHIDGET_RFID_PROTOCOL_EM4100 1L +#undef com_phidgets_RFIDPhidget_PHIDGET_RFID_PROTOCOL_ISO11785_FDX_B +#define com_phidgets_RFIDPhidget_PHIDGET_RFID_PROTOCOL_ISO11785_FDX_B 2L +#undef com_phidgets_RFIDPhidget_PHIDGET_RFID_PROTOCOL_PHIDGETS +#define com_phidgets_RFIDPhidget_PHIDGET_RFID_PROTOCOL_PHIDGETS 3L /* * Class: com_phidgets_RFIDPhidget * Method: create @@ -225,6 +231,14 @@ JNIEXPORT jstring JNICALL Java_com_phidgets_RFIDPhidget_getLastTag /* * Class: com_phidgets_RFIDPhidget + * Method: getLastTagProtocol + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_phidgets_RFIDPhidget_getLastTagProtocol + (JNIEnv *, jobject); + +/* + * Class: com_phidgets_RFIDPhidget * Method: getTagStatus * Signature: ()Z */ @@ -233,6 +247,14 @@ JNIEXPORT jboolean JNICALL Java_com_phidgets_RFIDPhidget_getTagStatus /* * Class: com_phidgets_RFIDPhidget + * Method: write + * Signature: (Ljava/lang/String;IZ)V + */ +JNIEXPORT void JNICALL Java_com_phidgets_RFIDPhidget_write + (JNIEnv *, jobject, jstring, jint, jboolean); + +/* + * Class: com_phidgets_RFIDPhidget * Method: enableTagGainEvents * Signature: (Z)V */ |