Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-04 03:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Applied updated DIOJNI file from Ron Rossbach. Fixes artf3982."

Browse Source
This commit is contained in:
Brad Miller (WPI)
2015-01-16 07:36:17 -08:00
committed by Gerrit Code Review
parent 352c021b17 7600473da6
commit 081d7f7361
1 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
wpilibj/wpilibJavaJNI/lib/DIOJNI.cpp
View File

@@ -113,10 +113,17 @@ JNIEXPORT jbyte JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_getDIO
* Signature: (Ljava/nio/ByteBuffer;Ljava/nio/IntBuffer;)B * Signature: (Ljava/nio/ByteBuffer;Ljava/nio/IntBuffer;)B
*/ */
JNIEXPORT jbyte JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_getDIODirection JNIEXPORT jbyte JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_getDIODirection
(JNIEnv *, jclass, jobject, jobject) (JNIEnv *env, jclass, jobject id, jobject status)
{ {
assert(false); DIOJNI_LOG(logDEBUG) << "Calling DIOJNI getDIODirection (RR upd)";
void ** javaId = (void**)env->GetDirectBufferAddress(id);
//DIOJNI_LOG(logDEBUG) << "Port Ptr = " << *javaId;
jint * statusPtr = (jint*)env->GetDirectBufferAddress(status);
//DIOJNI_LOG(logDEBUG) << "Status Ptr = " << statusPtr;
jbyte returnValue = getDIODirection(*javaId, statusPtr);
//DIOJNI_LOG(logDEBUG) << "Status = " << *statusPtr;
DIOJNI_LOG(logDEBUG) << "getDIODirectionResult = " << (jbyte)returnValue;
return returnValue;
} }
/* /*
@@ -125,10 +132,16 @@ JNIEXPORT jbyte JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_getDIODirection
* Signature: (Ljava/nio/ByteBuffer;DLjava/nio/IntBuffer;)V * Signature: (Ljava/nio/ByteBuffer;DLjava/nio/IntBuffer;)V
*/ */
JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_pulse JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_pulse
(JNIEnv *, jclass, jobject, jdouble, jobject) (JNIEnv *env, jclass, jobject id, jdouble value, jobject status)
{ {
assert(false); DIOJNI_LOG(logDEBUG) << "Calling DIOJNI pulse (RR upd)";
void ** javaId = (void**)env->GetDirectBufferAddress(id);
//DIOJNI_LOG(logDEBUG) << "Port Ptr = " << *javaId;
//DIOJNI_LOG(logDEBUG) << "Value = " << value;
jint * statusPtr = (jint*)env->GetDirectBufferAddress(status);
//DIOJNI_LOG(logDEBUG) << "Status Ptr = " << statusPtr;
pulse(*javaId, value, statusPtr);
DIOJNI_LOG(logDEBUG) << "Did it work? Status = " << *statusPtr;
} }
/* /*
@@ -137,9 +150,18 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_pulse
* Signature: (Ljava/nio/ByteBuffer;Ljava/nio/IntBuffer;)B * Signature: (Ljava/nio/ByteBuffer;Ljava/nio/IntBuffer;)B
*/ */
JNIEXPORT jbyte JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_isPulsing JNIEXPORT jbyte JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_isPulsing
(JNIEnv *, jclass, jobject, jobject) (JNIEnv *env, jclass, jobject id, jobject status)
{ {
assert(false); DIOJNI_LOG(logDEBUG) << "Calling DIOJNI isPulsing (RR upd)";
void ** javaId = (void**)env->GetDirectBufferAddress(id);
//DIOJNI_LOG(logDEBUG) << "Port Ptr = " << *javaId;
jint * statusPtr = (jint*)env->GetDirectBufferAddress(status);
//DIOJNI_LOG(logDEBUG) << "Status Ptr = " << statusPtr;
jbyte returnValue = isPulsing(*javaId, statusPtr);
//DIOJNI_LOG(logDEBUG) << "Status = " << *statusPtr;
DIOJNI_LOG(logDEBUG) << "isPulsingResult = " << (jbyte)returnValue;
return returnValue;
} }
@@ -149,10 +171,14 @@ JNIEXPORT jbyte JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_isPulsing
* Signature: (Ljava/nio/IntBuffer;)B * Signature: (Ljava/nio/IntBuffer;)B
*/ */
JNIEXPORT jbyte JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_isAnyPulsing JNIEXPORT jbyte JNICALL Java_edu_wpi_first_wpilibj_hal_DIOJNI_isAnyPulsing
(JNIEnv *, jclass, jobject) (JNIEnv *env, jclass, jobject status)
{ {
assert(false); DIOJNI_LOG(logDEBUG) << "Calling DIOJNI isAnyPulsing (RR upd)";
jint * statusPtr = (jint*)env->GetDirectBufferAddress(status);
jbyte returnValue = isAnyPulsing( statusPtr );
//DIOJNI_LOG(logDEBUG) << "Status = " << *statusPtr;
DIOJNI_LOG(logDEBUG) << "isAnyPulsingResult = " << (jbyte)returnValue;
return returnValue;
} }
/* /*