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

Merge "Fix ControllerPower 5v faults and add javadocs. Fixes artf3918."

Browse Source
This commit is contained in:
Brad Miller (WPI)
2014-12-16 08:07:30 -08:00
committed by Gerrit Code Review
parent 170b5860ee a649d3b553
commit 786e844a9f
2 changed files with 62 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpilibj/wpilibJavaJNI/lib/PowerJNI.cpp
View File

@@ -119,7 +119,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_wpilibj_hal_PowerJNI_getUserCurrentFau
(JNIEnv * env, jclass, jobject status)
{
jint * statusPtr = (jint*)env->GetDirectBufferAddress(status);
return getUserCurrentFaults3V3(statusPtr);
return getUserCurrentFaults5V(statusPtr);
}
/*