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

Make PDP parameters consistent with other HAL functions.

Browse Source 
All other HAL functions have status as the last parameter, only PDP did not.
This changes makes the PDP parameter order consistent with the rest of the HAL.

Change-Id: I725e33f75deab34e6a83b7048b2d6c365fa56a21
This commit is contained in:
Peter Johnson
2015-11-06 15:43:06 -08:00
parent 84e793503d
commit 964b243619
4 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wpilibj/src/athena/cpp/lib/PDPJNI.cpp
View File

@@ -24,7 +24,7 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTemperatur
(JNIEnv *env, jclass, jint module)
{
int32_t status = 0;
double temperature = getPDPTemperature(&status, module);
double temperature = getPDPTemperature(module, &status);
CheckStatus(env, status, false);
return temperature;
}
@@ -38,7 +38,7 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPVoltage
(JNIEnv *env, jclass, jint module)
{
int32_t status = 0;
double voltage = getPDPVoltage(&status, module);
double voltage = getPDPVoltage(module, &status);
CheckStatus(env, status, false);
return voltage;
}
@@ -52,7 +52,7 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPChannelCur
(JNIEnv *env, jclass, jbyte channel, jint module)
{
int32_t status = 0;
double current = getPDPChannelCurrent(channel, &status, module);
double current = getPDPChannelCurrent(module, channel, &status);
CheckStatus(env, status, false);
return current;
}
@@ -66,7 +66,7 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTotalCurre
(JNIEnv *env, jclass, jint module)
{
int32_t status = 0;
double current = getPDPTotalCurrent(&status, module);
double current = getPDPTotalCurrent(module, &status);
CheckStatus(env, status, false);
return current;
}
@@ -80,7 +80,7 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTotalPower
(JNIEnv *env, jclass, jint module)
{
int32_t status = 0;
double power = getPDPTotalPower(&status, module);
double power = getPDPTotalPower(module, &status);
CheckStatus(env, status, false);
return power;
}
@@ -94,7 +94,7 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_wpilibj_hal_PDPJNI_getPDPTotalEnerg
(JNIEnv *env, jclass, jint module)
{
int32_t status = 0;
double energy = getPDPTotalEnergy(&status, module);
double energy = getPDPTotalEnergy(module, &status);
CheckStatus(env, status, false);
return energy;
}
@@ -109,7 +109,7 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_PDPJNI_resetPDPTotalEnergy
(JNIEnv *env, jclass, jint module)
{
int32_t status = 0;
resetPDPTotalEnergy(&status, module);
resetPDPTotalEnergy(module, &status);
CheckStatus(env, status, false);
}
@@ -122,7 +122,7 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_PDPJNI_clearPDPStickyFault
(JNIEnv *env, jclass, jint module)
{
int32_t status = 0;
clearPDPStickyFaults(&status, module);
clearPDPStickyFaults(module, &status);
CheckStatus(env, status, false);
}