From 4de70bff5ef9942163ec7c3eb59cc576ad32d1ab Mon Sep 17 00:00:00 2001 From: Thad House Date: Thu, 24 Nov 2016 21:49:34 -0800 Subject: [PATCH] Adds missing JNI method definitions (#371) --- wpilibj/src/athena/cpp/lib/HALUtil.cpp | 4 ++-- wpilibj/src/athena/cpp/lib/PWMJNI.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wpilibj/src/athena/cpp/lib/HALUtil.cpp b/wpilibj/src/athena/cpp/lib/HALUtil.cpp index 91d9beb954..5864208b2e 100644 --- a/wpilibj/src/athena/cpp/lib/HALUtil.cpp +++ b/wpilibj/src/athena/cpp/lib/HALUtil.cpp @@ -478,11 +478,11 @@ Java_edu_wpi_first_wpilibj_hal_HALUtil_getFPGAButton(JNIEnv *env, jclass) { /* * Class: edu_wpi_first_wpilibj_hal_HALUtil - * Method: HAL_GetErrorMessage + * Method: getHALErrorMessage * Signature: (I)Ljava/lang/String; */ JNIEXPORT jstring JNICALL -Java_edu_wpi_first_wpilibj_hal_HALUtil_HAL_GetErrorMessage( +Java_edu_wpi_first_wpilibj_hal_HALUtil_getHALErrorMessage( JNIEnv *paramEnv, jclass, jint paramId) { const char *msg = HAL_GetErrorMessage(paramId); HALUTIL_LOG(logDEBUG) << "Calling HALUtil HAL_GetErrorMessage id=" << paramId diff --git a/wpilibj/src/athena/cpp/lib/PWMJNI.cpp b/wpilibj/src/athena/cpp/lib/PWMJNI.cpp index 2176785bf0..3869176c37 100644 --- a/wpilibj/src/athena/cpp/lib/PWMJNI.cpp +++ b/wpilibj/src/athena/cpp/lib/PWMJNI.cpp @@ -148,7 +148,7 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWMEliminateDead * Method: getPWMEliminateDeadband * Signature: (I)Z */ -JNIEXPORT jboolean JNICALL Java_edu_wpi_first_wpilibj_hal_PWMJNI_setPWM( +JNIEXPORT jboolean JNICALL Java_edu_wpi_first_wpilibj_hal_PWMJNI_getPWMEliminateDeadband( JNIEnv* env, jclass, jint id) { PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; int32_t status = 0;