Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-24 01:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
5V faults was returning count of 3.3V faults. Copied javadocs from
C++.

Change-Id: I95b5c6ed1213ed235ecde11ef7e28ad05aabca6e
This commit is contained in:
Joe Ross
2014-12-14 14:24:15 -08:00
parent ac60198842
commit a649d3b553
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);
}
/*