aboutsummaryrefslogtreecommitdiffstats
path: root/Java/com_phidgets_LEDPhidget.c
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
commit477e8e9570cebe9152c011a76defd6e9ce21fac7 (patch)
tree257399dd5eb402a14de37452069e080662c5c1c3 /Java/com_phidgets_LEDPhidget.c
parent827093b9a63335655c696d4beb3134613c4414e6 (diff)
parent46bd2ba42d186a81d7ad7e4a55e03dd63b2d042f (diff)
downloadlibphidget21-477e8e9570cebe9152c011a76defd6e9ce21fac7.tar.gz
Merge tag 'upstream/2.1.8.20121218'
Upstream version 2.1.8.20121218
Diffstat (limited to 'Java/com_phidgets_LEDPhidget.c')
-rw-r--r--Java/com_phidgets_LEDPhidget.c8
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)