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_LEDPhidget.c | |
| 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_LEDPhidget.c')
| -rw-r--r-- | Java/com_phidgets_LEDPhidget.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Java/com_phidgets_LEDPhidget.c b/Java/com_phidgets_LEDPhidget.c index 20097b9..c5fb201 100644 --- a/Java/com_phidgets_LEDPhidget.c +++ b/Java/com_phidgets_LEDPhidget.c @@ -9,10 +9,14 @@ JNI_LOAD(accel, LED) JNI_CREATE(LED) JNI_INDEXED_GETFUNC(LED, DiscreteLED, DiscreteLED, jint) JNI_INDEXED_SETFUNC(LED, DiscreteLED, DiscreteLED, jint) +JNI_INDEXED_GETFUNC(LED, Brightness, Brightness, jdouble) +JNI_INDEXED_SETFUNC(LED, Brightness, Brightness, jdouble) +JNI_INDEXED_GETFUNC(LED, CurrentLimit__I, CurrentLimitIndexed, jdouble) +JNI_INDEXED_SETFUNC(LED, CurrentLimit__ID, CurrentLimitIndexed, jdouble) JNI_GETFUNC(LED, LEDCount, LEDCount, jint) JNIEXPORT jint JNICALL -Java_com_phidgets_LEDPhidget_getCurrentLimit(JNIEnv *env, jobject obj) +Java_com_phidgets_LEDPhidget_getCurrentLimit__(JNIEnv *env, jobject obj) { CPhidgetLEDHandle h = (CPhidgetLEDHandle)(uintptr_t) (*env)->GetLongField(env, obj, handle_fid); @@ -22,7 +26,7 @@ Java_com_phidgets_LEDPhidget_getCurrentLimit(JNIEnv *env, jobject obj) PH_THROW(error); return (jint)v; } -JNI_SETFUNC(LED, CurrentLimit, CurrentLimit, jint) +JNI_SETFUNC(LED, CurrentLimit__I, CurrentLimit, jint) JNIEXPORT jint JNICALL Java_com_phidgets_LEDPhidget_getVoltage(JNIEnv *env, jobject obj) |