diff --git a/hal/src/main/native/cpp/jni/AnalogGyroJNI.cpp b/hal/src/main/native/cpp/jni/AnalogGyroJNI.cpp index 74c1b49b30..35b7414435 100644 --- a/hal/src/main/native/cpp/jni/AnalogGyroJNI.cpp +++ b/hal/src/main/native/cpp/jni/AnalogGyroJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -12,20 +12,10 @@ #include "HALUtil.h" #include "edu_wpi_first_hal_AnalogGyroJNI.h" #include "hal/AnalogGyro.h" -#include "hal/cpp/Log.h" #include "hal/handles/HandlesInternal.h" using namespace frc; -// set the logging level -TLogLevel analogGyroJNILogLevel = logWARNING; - -#define ANALOGGYROJNI_LOG(level) \ - if (level > analogGyroJNILogLevel) \ - ; \ - else \ - Log().Get(level) - extern "C" { /* * Class: edu_wpi_first_hal_AnalogGyroJNI @@ -36,14 +26,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_AnalogGyroJNI_initializeAnalogGyro (JNIEnv* env, jclass, jint id) { - ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI initializeAnalogGyro"; - ANALOGGYROJNI_LOG(logDEBUG) - << "Analog Input Handle = " << (HAL_AnalogInputHandle)id; int32_t status = 0; HAL_GyroHandle handle = HAL_InitializeAnalogGyro((HAL_AnalogInputHandle)id, &status); - ANALOGGYROJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGGYROJNI_LOG(logDEBUG) << "Gyro Handle = " << handle; // Analog input does range checking, so we don't need to do so. CheckStatusForceThrow(env, status); return (jint)handle; @@ -58,11 +43,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogGyroJNI_setupAnalogGyro (JNIEnv* env, jclass, jint id) { - ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI setupAnalogGyro"; - ANALOGGYROJNI_LOG(logDEBUG) << "Gyro Handle = " << (HAL_GyroHandle)id; int32_t status = 0; HAL_SetupAnalogGyro((HAL_GyroHandle)id, &status); - ANALOGGYROJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -75,8 +57,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogGyroJNI_freeAnalogGyro (JNIEnv* env, jclass, jint id) { - ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI freeAnalogGyro"; - ANALOGGYROJNI_LOG(logDEBUG) << "Gyro Handle = " << (HAL_GyroHandle)id; HAL_FreeAnalogGyro((HAL_GyroHandle)id); } @@ -89,13 +69,9 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogGyroJNI_setAnalogGyroParameters (JNIEnv* env, jclass, jint id, jdouble vPDPS, jdouble offset, jint center) { - ANALOGGYROJNI_LOG(logDEBUG) - << "Calling ANALOGGYROJNI setAnalogGyroParameters"; - ANALOGGYROJNI_LOG(logDEBUG) << "Gyro Handle = " << (HAL_GyroHandle)id; int32_t status = 0; HAL_SetAnalogGyroParameters((HAL_GyroHandle)id, vPDPS, offset, center, &status); - ANALOGGYROJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -108,13 +84,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogGyroJNI_setAnalogGyroVoltsPerDegreePerSecond (JNIEnv* env, jclass, jint id, jdouble vPDPS) { - ANALOGGYROJNI_LOG(logDEBUG) - << "Calling ANALOGGYROJNI setAnalogGyroVoltsPerDegreePerSecond"; - ANALOGGYROJNI_LOG(logDEBUG) << "Gyro Handle = " << (HAL_GyroHandle)id; - ANALOGGYROJNI_LOG(logDEBUG) << "vPDPS = " << vPDPS; int32_t status = 0; HAL_SetAnalogGyroVoltsPerDegreePerSecond((HAL_GyroHandle)id, vPDPS, &status); - ANALOGGYROJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -127,11 +98,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogGyroJNI_resetAnalogGyro (JNIEnv* env, jclass, jint id) { - ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI resetAnalogGyro"; - ANALOGGYROJNI_LOG(logDEBUG) << "Gyro Handle = " << (HAL_GyroHandle)id; int32_t status = 0; HAL_ResetAnalogGyro((HAL_GyroHandle)id, &status); - ANALOGGYROJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -144,11 +112,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogGyroJNI_calibrateAnalogGyro (JNIEnv* env, jclass, jint id) { - ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI calibrateAnalogGyro"; - ANALOGGYROJNI_LOG(logDEBUG) << "Gyro Handle = " << (HAL_GyroHandle)id; int32_t status = 0; HAL_CalibrateAnalogGyro((HAL_GyroHandle)id, &status); - ANALOGGYROJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -161,11 +126,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogGyroJNI_setAnalogGyroDeadband (JNIEnv* env, jclass, jint id, jdouble deadband) { - ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI setAnalogGyroDeadband"; - ANALOGGYROJNI_LOG(logDEBUG) << "Gyro Handle = " << (HAL_GyroHandle)id; int32_t status = 0; HAL_SetAnalogGyroDeadband((HAL_GyroHandle)id, deadband, &status); - ANALOGGYROJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -178,12 +140,8 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_hal_AnalogGyroJNI_getAnalogGyroAngle (JNIEnv* env, jclass, jint id) { - ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI getAnalogGyroAngle"; - ANALOGGYROJNI_LOG(logDEBUG) << "Gyro Handle = " << (HAL_GyroHandle)id; int32_t status = 0; jdouble value = HAL_GetAnalogGyroAngle((HAL_GyroHandle)id, &status); - ANALOGGYROJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGGYROJNI_LOG(logDEBUG) << "Result = " << value; CheckStatus(env, status); return value; } @@ -197,12 +155,8 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_hal_AnalogGyroJNI_getAnalogGyroRate (JNIEnv* env, jclass, jint id) { - ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI getAnalogGyroRate"; - ANALOGGYROJNI_LOG(logDEBUG) << "Gyro Handle = " << (HAL_GyroHandle)id; int32_t status = 0; jdouble value = HAL_GetAnalogGyroRate((HAL_GyroHandle)id, &status); - ANALOGGYROJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGGYROJNI_LOG(logDEBUG) << "Result = " << value; CheckStatus(env, status); return value; } @@ -216,12 +170,8 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_hal_AnalogGyroJNI_getAnalogGyroOffset (JNIEnv* env, jclass, jint id) { - ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI getAnalogGyroOffset"; - ANALOGGYROJNI_LOG(logDEBUG) << "Gyro Handle = " << (HAL_GyroHandle)id; int32_t status = 0; jdouble value = HAL_GetAnalogGyroOffset((HAL_GyroHandle)id, &status); - ANALOGGYROJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGGYROJNI_LOG(logDEBUG) << "Result = " << value; CheckStatus(env, status); return value; } @@ -235,12 +185,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_AnalogGyroJNI_getAnalogGyroCenter (JNIEnv* env, jclass, jint id) { - ANALOGGYROJNI_LOG(logDEBUG) << "Calling ANALOGGYROJNI getAnalogGyroCenter"; - ANALOGGYROJNI_LOG(logDEBUG) << "Gyro Handle = " << (HAL_GyroHandle)id; int32_t status = 0; jint value = HAL_GetAnalogGyroCenter((HAL_GyroHandle)id, &status); - ANALOGGYROJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGGYROJNI_LOG(logDEBUG) << "Result = " << value; CheckStatus(env, status); return value; } diff --git a/hal/src/main/native/cpp/jni/AnalogJNI.cpp b/hal/src/main/native/cpp/jni/AnalogJNI.cpp index 3b2aa2d522..9998b3d428 100644 --- a/hal/src/main/native/cpp/jni/AnalogJNI.cpp +++ b/hal/src/main/native/cpp/jni/AnalogJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -16,20 +16,10 @@ #include "hal/AnalogOutput.h" #include "hal/AnalogTrigger.h" #include "hal/Ports.h" -#include "hal/cpp/Log.h" #include "hal/handles/HandlesInternal.h" using namespace frc; -// set the logging level -TLogLevel analogJNILogLevel = logWARNING; - -#define ANALOGJNI_LOG(level) \ - if (level > analogJNILogLevel) \ - ; \ - else \ - Log().Get(level) - extern "C" { /* @@ -41,11 +31,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_AnalogJNI_initializeAnalogInputPort (JNIEnv* env, jclass, jint id) { - ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_PortHandle)id; int32_t status = 0; auto analog = HAL_InitializeAnalogInputPort((HAL_PortHandle)id, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << analog; CheckStatusRange(env, status, 0, HAL_GetNumAnalogInputs(), hal::getPortHandleChannel((HAL_PortHandle)id)); return (jint)analog; @@ -60,7 +47,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogJNI_freeAnalogInputPort (JNIEnv* env, jclass, jint id) { - ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_AnalogInputHandle)id; HAL_FreeAnalogInputPort((HAL_AnalogInputHandle)id); } @@ -73,12 +59,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_AnalogJNI_initializeAnalogOutputPort (JNIEnv* env, jclass, jint id) { - ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_PortHandle)id; int32_t status = 0; HAL_AnalogOutputHandle analog = HAL_InitializeAnalogOutputPort((HAL_PortHandle)id, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << analog; CheckStatusRange(env, status, 0, HAL_GetNumAnalogOutputs(), hal::getPortHandleChannel((HAL_PortHandle)id)); return (jlong)analog; @@ -93,7 +76,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogJNI_freeAnalogOutputPort (JNIEnv* env, jclass, jint id) { - ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << id; HAL_FreeAnalogOutputPort((HAL_AnalogOutputHandle)id); } @@ -106,10 +88,7 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_AnalogJNI_checkAnalogModule (JNIEnv*, jclass, jbyte value) { - // ANALOGJNI_LOG(logDEBUG) << "Module = " << (jint)value; jboolean returnValue = HAL_CheckAnalogModule(value); - // ANALOGJNI_LOG(logDEBUG) << "checkAnalogModuleResult = " << - // (jint)returnValue; return returnValue; } @@ -122,10 +101,7 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_AnalogJNI_checkAnalogInputChannel (JNIEnv*, jclass, jint value) { - // ANALOGJNI_LOG(logDEBUG) << "Channel = " << value; jboolean returnValue = HAL_CheckAnalogInputChannel(value); - // ANALOGJNI_LOG(logDEBUG) << "checkAnalogChannelResult = " << - // (jint)returnValue; return returnValue; } @@ -138,10 +114,7 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_AnalogJNI_checkAnalogOutputChannel (JNIEnv*, jclass, jint value) { - // ANALOGJNI_LOG(logDEBUG) << "Channel = " << value; jboolean returnValue = HAL_CheckAnalogOutputChannel(value); - // ANALOGJNI_LOG(logDEBUG) << "checkAnalogChannelResult = " << - // (jint)returnValue; return returnValue; } @@ -154,9 +127,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogJNI_setAnalogOutput (JNIEnv* env, jclass, jint id, jdouble voltage) { - ANALOGJNI_LOG(logDEBUG) << "Calling setAnalogOutput"; - ANALOGJNI_LOG(logDEBUG) << "Voltage = " << voltage; - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << id; int32_t status = 0; HAL_SetAnalogOutput((HAL_AnalogOutputHandle)id, voltage, &status); CheckStatus(env, status); @@ -186,10 +156,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogJNI_setAnalogSampleRate (JNIEnv* env, jclass, jdouble value) { - ANALOGJNI_LOG(logDEBUG) << "SampleRate = " << value; int32_t status = 0; HAL_SetAnalogSampleRate(value, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -204,8 +172,6 @@ Java_edu_wpi_first_hal_AnalogJNI_getAnalogSampleRate { int32_t status = 0; double returnValue = HAL_GetAnalogSampleRate(&status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGJNI_LOG(logDEBUG) << "SampleRate = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -219,11 +185,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogJNI_setAnalogAverageBits (JNIEnv* env, jclass, jint id, jint value) { - ANALOGJNI_LOG(logDEBUG) << "AverageBits = " << value; - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; int32_t status = 0; HAL_SetAnalogAverageBits((HAL_AnalogInputHandle)id, value, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -236,12 +199,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_AnalogJNI_getAnalogAverageBits (JNIEnv* env, jclass, jint id) { - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; int32_t status = 0; jint returnValue = HAL_GetAnalogAverageBits((HAL_AnalogInputHandle)id, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGJNI_LOG(logDEBUG) << "AverageBits = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -255,11 +215,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogJNI_setAnalogOversampleBits (JNIEnv* env, jclass, jint id, jint value) { - ANALOGJNI_LOG(logDEBUG) << "OversampleBits = " << value; - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; int32_t status = 0; HAL_SetAnalogOversampleBits((HAL_AnalogInputHandle)id, value, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -272,12 +229,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_AnalogJNI_getAnalogOversampleBits (JNIEnv* env, jclass, jint id) { - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; int32_t status = 0; jint returnValue = HAL_GetAnalogOversampleBits((HAL_AnalogInputHandle)id, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGJNI_LOG(logDEBUG) << "OversampleBits = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -291,11 +245,8 @@ JNIEXPORT jshort JNICALL Java_edu_wpi_first_hal_AnalogJNI_getAnalogValue (JNIEnv* env, jclass, jint id) { - // ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (void*)id; int32_t status = 0; jshort returnValue = HAL_GetAnalogValue((HAL_AnalogInputHandle)id, &status); - // ANALOGJNI_LOG(logDEBUG) << "Status = " << status; - // ANALOGJNI_LOG(logDEBUG) << "Value = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -309,12 +260,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_AnalogJNI_getAnalogAverageValue (JNIEnv* env, jclass, jint id) { - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; int32_t status = 0; jint returnValue = HAL_GetAnalogAverageValue((HAL_AnalogInputHandle)id, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGJNI_LOG(logDEBUG) << "AverageValue = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -328,13 +276,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_AnalogJNI_getAnalogVoltsToValue (JNIEnv* env, jclass, jint id, jdouble voltageValue) { - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; - ANALOGJNI_LOG(logDEBUG) << "VoltageValue = " << voltageValue; int32_t status = 0; jint returnValue = HAL_GetAnalogVoltsToValue((HAL_AnalogInputHandle)id, voltageValue, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGJNI_LOG(logDEBUG) << "Value = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -348,12 +292,9 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_hal_AnalogJNI_getAnalogVoltage (JNIEnv* env, jclass, jint id) { - // ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (void*)id; int32_t status = 0; jdouble returnValue = HAL_GetAnalogVoltage((HAL_AnalogInputHandle)id, &status); - // ANALOGJNI_LOG(logDEBUG) << "Status = " << status; - // ANALOGJNI_LOG(logDEBUG) << "Voltage = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -367,12 +308,9 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_hal_AnalogJNI_getAnalogAverageVoltage (JNIEnv* env, jclass, jint id) { - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; int32_t status = 0; jdouble returnValue = HAL_GetAnalogAverageVoltage((HAL_AnalogInputHandle)id, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGJNI_LOG(logDEBUG) << "AverageVoltage = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -386,12 +324,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_AnalogJNI_getAnalogLSBWeight (JNIEnv* env, jclass, jint id) { - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; int32_t status = 0; jint returnValue = HAL_GetAnalogLSBWeight((HAL_AnalogInputHandle)id, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGJNI_LOG(logDEBUG) << "AnalogLSBWeight = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -405,12 +340,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_AnalogJNI_getAnalogOffset (JNIEnv* env, jclass, jint id) { - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; int32_t status = 0; jint returnValue = HAL_GetAnalogOffset((HAL_AnalogInputHandle)id, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGJNI_LOG(logDEBUG) << "AnalogOffset = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -424,14 +356,10 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_AnalogJNI_isAccumulatorChannel (JNIEnv* env, jclass, jint id) { - ANALOGJNI_LOG(logDEBUG) << "isAccumulatorChannel"; - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; int32_t status = 0; jboolean returnValue = HAL_IsAccumulatorChannel((HAL_AnalogInputHandle)id, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGJNI_LOG(logDEBUG) << "AnalogOffset = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -445,10 +373,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogJNI_initAccumulator (JNIEnv* env, jclass, jint id) { - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; int32_t status = 0; HAL_InitAccumulator((HAL_AnalogInputHandle)id, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -461,10 +387,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogJNI_resetAccumulator (JNIEnv* env, jclass, jint id) { - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; int32_t status = 0; HAL_ResetAccumulator((HAL_AnalogInputHandle)id, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -477,10 +401,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogJNI_setAccumulatorCenter (JNIEnv* env, jclass, jint id, jint center) { - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; int32_t status = 0; HAL_SetAccumulatorCenter((HAL_AnalogInputHandle)id, center, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -493,10 +415,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogJNI_setAccumulatorDeadband (JNIEnv* env, jclass, jint id, jint deadband) { - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; int32_t status = 0; HAL_SetAccumulatorDeadband((HAL_AnalogInputHandle)id, deadband, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -509,12 +429,9 @@ JNIEXPORT jlong JNICALL Java_edu_wpi_first_hal_AnalogJNI_getAccumulatorValue (JNIEnv* env, jclass, jint id) { - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; int32_t status = 0; jlong returnValue = HAL_GetAccumulatorValue((HAL_AnalogInputHandle)id, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGJNI_LOG(logDEBUG) << "AccumulatorValue = " << returnValue; CheckStatus(env, status); return returnValue; @@ -529,12 +446,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_AnalogJNI_getAccumulatorCount (JNIEnv* env, jclass, jint id) { - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; int32_t status = 0; jint returnValue = HAL_GetAccumulatorCount((HAL_AnalogInputHandle)id, &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGJNI_LOG(logDEBUG) << "AccumulatorCount = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -548,15 +462,11 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogJNI_getAccumulatorOutput (JNIEnv* env, jclass, jint id, jobject accumulatorResult) { - ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id; int32_t status = 0; int64_t value = 0; int64_t count = 0; HAL_GetAccumulatorOutput((HAL_AnalogInputHandle)id, &value, &count, &status); SetAccumulatorResultObject(env, accumulatorResult, value, count); - ANALOGJNI_LOG(logDEBUG) << "Value = " << value; - ANALOGJNI_LOG(logDEBUG) << "Count = " << count; - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -569,16 +479,12 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_AnalogJNI_initializeAnalogTrigger (JNIEnv* env, jclass, jint id, jobject index) { - ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_AnalogInputHandle)id; jint* indexHandle = reinterpret_cast(env->GetDirectBufferAddress(index)); - ANALOGJNI_LOG(logDEBUG) << "Index Ptr = " << indexHandle; int32_t status = 0; HAL_AnalogTriggerHandle analogTrigger = HAL_InitializeAnalogTrigger( (HAL_AnalogInputHandle)id, reinterpret_cast(indexHandle), &status); - ANALOGJNI_LOG(logDEBUG) << "Status = " << status; - ANALOGJNI_LOG(logDEBUG) << "AnalogTrigger Handle = " << analogTrigger; CheckStatus(env, status); return (jint)analogTrigger; } @@ -592,8 +498,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogJNI_cleanAnalogTrigger (JNIEnv* env, jclass, jint id) { - ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " - << (HAL_AnalogTriggerHandle)id; int32_t status = 0; HAL_CleanAnalogTrigger((HAL_AnalogTriggerHandle)id, &status); CheckStatus(env, status); @@ -608,8 +512,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogJNI_setAnalogTriggerLimitsRaw (JNIEnv* env, jclass, jint id, jint lower, jint upper) { - ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " - << (HAL_AnalogTriggerHandle)id; int32_t status = 0; HAL_SetAnalogTriggerLimitsRaw((HAL_AnalogTriggerHandle)id, lower, upper, &status); @@ -625,8 +527,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogJNI_setAnalogTriggerLimitsVoltage (JNIEnv* env, jclass, jint id, jdouble lower, jdouble upper) { - ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " - << (HAL_AnalogTriggerHandle)id; int32_t status = 0; HAL_SetAnalogTriggerLimitsVoltage((HAL_AnalogTriggerHandle)id, lower, upper, &status); @@ -642,8 +542,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogJNI_setAnalogTriggerAveraged (JNIEnv* env, jclass, jint id, jboolean averaged) { - ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " - << (HAL_AnalogTriggerHandle)id; int32_t status = 0; HAL_SetAnalogTriggerAveraged((HAL_AnalogTriggerHandle)id, averaged, &status); CheckStatus(env, status); @@ -658,8 +556,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_AnalogJNI_setAnalogTriggerFiltered (JNIEnv* env, jclass, jint id, jboolean filtered) { - ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " - << (HAL_AnalogTriggerHandle)id; int32_t status = 0; HAL_SetAnalogTriggerFiltered((HAL_AnalogTriggerHandle)id, filtered, &status); CheckStatus(env, status); @@ -674,8 +570,6 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_AnalogJNI_getAnalogTriggerInWindow (JNIEnv* env, jclass, jint id) { - ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " - << (HAL_AnalogTriggerHandle)id; int32_t status = 0; jboolean val = HAL_GetAnalogTriggerInWindow((HAL_AnalogTriggerHandle)id, &status); @@ -692,8 +586,6 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_AnalogJNI_getAnalogTriggerTriggerState (JNIEnv* env, jclass, jint id) { - ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " - << (HAL_AnalogTriggerHandle)id; int32_t status = 0; jboolean val = HAL_GetAnalogTriggerTriggerState((HAL_AnalogTriggerHandle)id, &status); @@ -710,8 +602,6 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_AnalogJNI_getAnalogTriggerOutput (JNIEnv* env, jclass, jint id, jint type) { - ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " - << (HAL_AnalogTriggerHandle)id; int32_t status = 0; jboolean val = HAL_GetAnalogTriggerOutput( (HAL_AnalogTriggerHandle)id, (HAL_AnalogTriggerType)type, &status); diff --git a/hal/src/main/native/cpp/jni/CANAPIJNI.cpp b/hal/src/main/native/cpp/jni/CANAPIJNI.cpp index bcb285c20d..8552f9106c 100644 --- a/hal/src/main/native/cpp/jni/CANAPIJNI.cpp +++ b/hal/src/main/native/cpp/jni/CANAPIJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -18,7 +18,6 @@ #include "hal/CAN.h" #include "hal/CANAPI.h" #include "hal/Errors.h" -#include "hal/cpp/Log.h" using namespace frc; using namespace wpi::java; diff --git a/hal/src/main/native/cpp/jni/CANJNI.cpp b/hal/src/main/native/cpp/jni/CANJNI.cpp index 0f46d15a17..9278c24a3b 100644 --- a/hal/src/main/native/cpp/jni/CANJNI.cpp +++ b/hal/src/main/native/cpp/jni/CANJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -16,21 +16,10 @@ #include "HALUtil.h" #include "edu_wpi_first_hal_can_CANJNI.h" #include "hal/CAN.h" -#include "hal/cpp/Log.h" using namespace frc; using namespace wpi::java; -// set the logging level -// TLogLevel canJNILogLevel = logDEBUG; -TLogLevel canJNILogLevel = logERROR; - -#define CANJNI_LOG(level) \ - if (level > canJNILogLevel) \ - ; \ - else \ - Log().Get(level) - extern "C" { /* @@ -42,37 +31,14 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_can_CANJNI_FRCNetCommCANSessionMuxSendMessage (JNIEnv* env, jclass, jint messageID, jbyteArray data, jint periodMs) { - CANJNI_LOG(logDEBUG) << "Calling CANJNI FRCNetCommCANSessionMuxSendMessage"; - JByteArrayRef dataArray{env, data}; const uint8_t* dataBuffer = reinterpret_cast(dataArray.array().data()); uint8_t dataSize = dataArray.array().size(); - CANJNI_LOG(logDEBUG) << "Message ID "; - CANJNI_LOG(logDEBUG).write_hex(messageID); - - if (logDEBUG <= canJNILogLevel) { - if (dataBuffer) { - wpi::SmallString<128> buf; - wpi::raw_svector_ostream str(buf); - for (int32_t i = 0; i < dataSize; i++) { - str.write_hex(dataBuffer[i]) << ' '; - } - - Log().Get(logDEBUG) << "Data: " << str.str(); - } else { - CANJNI_LOG(logDEBUG) << "Data: null"; - } - } - - CANJNI_LOG(logDEBUG) << "Period: " << periodMs; - int32_t status = 0; HAL_CAN_SendMessage(messageID, dataBuffer, dataSize, periodMs, &status); - - CANJNI_LOG(logDEBUG) << "Status: " << status; CheckCANStatus(env, status, messageID); } @@ -86,9 +52,6 @@ Java_edu_wpi_first_hal_can_CANJNI_FRCNetCommCANSessionMuxReceiveMessage (JNIEnv* env, jclass, jobject messageID, jint messageIDMask, jobject timeStamp) { - CANJNI_LOG(logDEBUG) - << "Calling CANJNI FRCNetCommCANSessionMuxReceiveMessage"; - uint32_t* messageIDPtr = reinterpret_cast(env->GetDirectBufferAddress(messageID)); uint32_t* timeStampPtr = @@ -101,28 +64,6 @@ Java_edu_wpi_first_hal_can_CANJNI_FRCNetCommCANSessionMuxReceiveMessage HAL_CAN_ReceiveMessage(messageIDPtr, messageIDMask, buffer, &dataSize, timeStampPtr, &status); - CANJNI_LOG(logDEBUG) << "Message ID "; - CANJNI_LOG(logDEBUG).write_hex(*messageIDPtr); - - if (logDEBUG <= canJNILogLevel) { - wpi::SmallString<128> buf; - wpi::raw_svector_ostream str(buf); - - for (int32_t i = 0; i < dataSize; i++) { - // Pad one-digit data with a zero - if (buffer[i] <= 16) { - str << '0'; - } - - str.write_hex(buffer[i]) << ' '; - } - - Log().Get(logDEBUG) << "Data: " << str.str(); - } - - CANJNI_LOG(logDEBUG) << "Timestamp: " << *timeStampPtr; - CANJNI_LOG(logDEBUG) << "Status: " << status; - if (!CheckCANStatus(env, status, *messageIDPtr)) return nullptr; return MakeJByteArray(env, wpi::StringRef{reinterpret_cast(buffer), @@ -138,8 +79,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_can_CANJNI_GetCANStatus (JNIEnv* env, jclass, jobject canStatus) { - CANJNI_LOG(logDEBUG) << "Calling CANJNI HAL_CAN_GetCANStatus"; - float percentBusUtilization = 0; uint32_t busOffCount = 0; uint32_t txFullCount = 0; diff --git a/hal/src/main/native/cpp/jni/CompressorJNI.cpp b/hal/src/main/native/cpp/jni/CompressorJNI.cpp index e38abb5874..75a5e0a336 100644 --- a/hal/src/main/native/cpp/jni/CompressorJNI.cpp +++ b/hal/src/main/native/cpp/jni/CompressorJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -10,7 +10,6 @@ #include "hal/Compressor.h" #include "hal/Ports.h" #include "hal/Solenoid.h" -#include "hal/cpp/Log.h" using namespace frc; diff --git a/hal/src/main/native/cpp/jni/ConstantsJNI.cpp b/hal/src/main/native/cpp/jni/ConstantsJNI.cpp index 3db8f5a6d4..fb1ae0b516 100644 --- a/hal/src/main/native/cpp/jni/ConstantsJNI.cpp +++ b/hal/src/main/native/cpp/jni/ConstantsJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -12,19 +12,9 @@ #include "HALUtil.h" #include "edu_wpi_first_hal_ConstantsJNI.h" #include "hal/Constants.h" -#include "hal/cpp/Log.h" using namespace frc; -// set the logging level -TLogLevel constantsJNILogLevel = logWARNING; - -#define CONSTANTSJNI_LOG(level) \ - if (level > constantsJNILogLevel) \ - ; \ - else \ - Log().Get(level) - extern "C" { /* * Class: edu_wpi_first_hal_ConstantsJNI @@ -35,10 +25,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_ConstantsJNI_getSystemClockTicksPerMicrosecond (JNIEnv* env, jclass) { - CONSTANTSJNI_LOG(logDEBUG) - << "Calling ConstantsJNI getSystemClockTicksPerMicrosecond"; jint value = HAL_GetSystemClockTicksPerMicrosecond(); - CONSTANTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } } // extern "C" diff --git a/hal/src/main/native/cpp/jni/CounterJNI.cpp b/hal/src/main/native/cpp/jni/CounterJNI.cpp index 70ec5be4c2..41dedabb00 100644 --- a/hal/src/main/native/cpp/jni/CounterJNI.cpp +++ b/hal/src/main/native/cpp/jni/CounterJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -13,19 +13,9 @@ #include "edu_wpi_first_hal_CounterJNI.h" #include "hal/Counter.h" #include "hal/Errors.h" -#include "hal/cpp/Log.h" using namespace frc; -// set the logging level -TLogLevel counterJNILogLevel = logWARNING; - -#define COUNTERJNI_LOG(level) \ - if (level > counterJNILogLevel) \ - ; \ - else \ - Log().Get(level) - extern "C" { /* @@ -37,17 +27,10 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_CounterJNI_initializeCounter (JNIEnv* env, jclass, jint mode, jobject index) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI initializeCounter"; - COUNTERJNI_LOG(logDEBUG) << "Mode = " << mode; jint* indexPtr = reinterpret_cast(env->GetDirectBufferAddress(index)); - COUNTERJNI_LOG(logDEBUG) << "Index Ptr = " - << reinterpret_cast(indexPtr); int32_t status = 0; auto counter = HAL_InitializeCounter( (HAL_Counter_Mode)mode, reinterpret_cast(indexPtr), &status); - COUNTERJNI_LOG(logDEBUG) << "Index = " << *indexPtr; - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; - COUNTERJNI_LOG(logDEBUG) << "COUNTER Handle = " << counter; CheckStatusForceThrow(env, status); return (jint)counter; } @@ -61,11 +44,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_CounterJNI_freeCounter (JNIEnv* env, jclass, jint id) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI freeCounter"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; int32_t status = 0; HAL_FreeCounter((HAL_CounterHandle)id, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -78,12 +58,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_CounterJNI_setCounterAverageSize (JNIEnv* env, jclass, jint id, jint value) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterAverageSize"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; - COUNTERJNI_LOG(logDEBUG) << "AverageSize = " << value; int32_t status = 0; HAL_SetCounterAverageSize((HAL_CounterHandle)id, value, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -97,14 +73,9 @@ Java_edu_wpi_first_hal_CounterJNI_setCounterUpSource (JNIEnv* env, jclass, jint id, jint digitalSourceHandle, jint analogTriggerType) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterUpSource"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; - COUNTERJNI_LOG(logDEBUG) << "digitalSourceHandle = " << digitalSourceHandle; - COUNTERJNI_LOG(logDEBUG) << "analogTriggerType = " << analogTriggerType; int32_t status = 0; HAL_SetCounterUpSource((HAL_CounterHandle)id, (HAL_Handle)digitalSourceHandle, (HAL_AnalogTriggerType)analogTriggerType, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -117,14 +88,9 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_CounterJNI_setCounterUpSourceEdge (JNIEnv* env, jclass, jint id, jboolean valueRise, jboolean valueFall) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterUpSourceEdge"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; - COUNTERJNI_LOG(logDEBUG) << "Rise = " << (jint)valueRise; - COUNTERJNI_LOG(logDEBUG) << "Fall = " << (jint)valueFall; int32_t status = 0; HAL_SetCounterUpSourceEdge((HAL_CounterHandle)id, valueRise, valueFall, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -137,11 +103,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_CounterJNI_clearCounterUpSource (JNIEnv* env, jclass, jint id) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI clearCounterUpSource"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; int32_t status = 0; HAL_ClearCounterUpSource((HAL_CounterHandle)id, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -155,15 +118,10 @@ Java_edu_wpi_first_hal_CounterJNI_setCounterDownSource (JNIEnv* env, jclass, jint id, jint digitalSourceHandle, jint analogTriggerType) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterDownSource"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; - COUNTERJNI_LOG(logDEBUG) << "digitalSourceHandle = " << digitalSourceHandle; - COUNTERJNI_LOG(logDEBUG) << "analogTriggerType = " << analogTriggerType; int32_t status = 0; HAL_SetCounterDownSource((HAL_CounterHandle)id, (HAL_Handle)digitalSourceHandle, (HAL_AnalogTriggerType)analogTriggerType, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; if (status == PARAMETER_OUT_OF_RANGE) { ThrowIllegalArgumentException(env, "Counter only supports DownSource in " @@ -182,14 +140,9 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_CounterJNI_setCounterDownSourceEdge (JNIEnv* env, jclass, jint id, jboolean valueRise, jboolean valueFall) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterDownSourceEdge"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; - COUNTERJNI_LOG(logDEBUG) << "Rise = " << (jint)valueRise; - COUNTERJNI_LOG(logDEBUG) << "Fall = " << (jint)valueFall; int32_t status = 0; HAL_SetCounterDownSourceEdge((HAL_CounterHandle)id, valueRise, valueFall, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -202,11 +155,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_CounterJNI_clearCounterDownSource (JNIEnv* env, jclass, jint id) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI clearCounterDownSource"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; int32_t status = 0; HAL_ClearCounterDownSource((HAL_CounterHandle)id, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -219,11 +169,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_CounterJNI_setCounterUpDownMode (JNIEnv* env, jclass, jint id) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterUpDownMode"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; int32_t status = 0; HAL_SetCounterUpDownMode((HAL_CounterHandle)id, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -236,12 +183,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_CounterJNI_setCounterExternalDirectionMode (JNIEnv* env, jclass, jint id) { - COUNTERJNI_LOG(logDEBUG) - << "Calling COUNTERJNI setCounterExternalDirectionMode"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; int32_t status = 0; HAL_SetCounterExternalDirectionMode((HAL_CounterHandle)id, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -254,12 +197,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_CounterJNI_setCounterSemiPeriodMode (JNIEnv* env, jclass, jint id, jboolean value) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterSemiPeriodMode"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; - COUNTERJNI_LOG(logDEBUG) << "SemiPeriodMode = " << (jint)value; int32_t status = 0; HAL_SetCounterSemiPeriodMode((HAL_CounterHandle)id, value, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -272,12 +211,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_CounterJNI_setCounterPulseLengthMode (JNIEnv* env, jclass, jint id, jdouble value) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterPulseLengthMode"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; - COUNTERJNI_LOG(logDEBUG) << "PulseLengthMode = " << value; int32_t status = 0; HAL_SetCounterPulseLengthMode((HAL_CounterHandle)id, value, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -290,14 +225,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_CounterJNI_getCounterSamplesToAverage (JNIEnv* env, jclass, jint id) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI getCounterSamplesToAverage"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; int32_t status = 0; jint returnValue = HAL_GetCounterSamplesToAverage((HAL_CounterHandle)id, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; - COUNTERJNI_LOG(logDEBUG) << "getCounterSamplesToAverageResult = " - << returnValue; CheckStatus(env, status); return returnValue; } @@ -311,12 +241,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_CounterJNI_setCounterSamplesToAverage (JNIEnv* env, jclass, jint id, jint value) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterSamplesToAverage"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; - COUNTERJNI_LOG(logDEBUG) << "SamplesToAverage = " << value; int32_t status = 0; HAL_SetCounterSamplesToAverage((HAL_CounterHandle)id, value, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; if (status == PARAMETER_OUT_OF_RANGE) { ThrowBoundaryException(env, value, 1, 127); return; @@ -333,11 +259,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_CounterJNI_resetCounter (JNIEnv* env, jclass, jint id) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI resetCounter"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; int32_t status = 0; HAL_ResetCounter((HAL_CounterHandle)id, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -350,12 +273,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_CounterJNI_getCounter (JNIEnv* env, jclass, jint id) { - // COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI getCounter"; - // COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; int32_t status = 0; jint returnValue = HAL_GetCounter((HAL_CounterHandle)id, &status); - // COUNTERJNI_LOG(logDEBUG) << "Status = " << status; - // COUNTERJNI_LOG(logDEBUG) << "getCounterResult = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -369,12 +288,8 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_hal_CounterJNI_getCounterPeriod (JNIEnv* env, jclass, jint id) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI getCounterPeriod"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; int32_t status = 0; jdouble returnValue = HAL_GetCounterPeriod((HAL_CounterHandle)id, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; - COUNTERJNI_LOG(logDEBUG) << "getCounterPeriodResult = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -388,12 +303,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_CounterJNI_setCounterMaxPeriod (JNIEnv* env, jclass, jint id, jdouble value) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterMaxPeriod"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; - COUNTERJNI_LOG(logDEBUG) << "MaxPeriod = " << value; int32_t status = 0; HAL_SetCounterMaxPeriod((HAL_CounterHandle)id, value, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -406,12 +317,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_CounterJNI_setCounterUpdateWhenEmpty (JNIEnv* env, jclass, jint id, jboolean value) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterMaxPeriod"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; - COUNTERJNI_LOG(logDEBUG) << "UpdateWhenEmpty = " << (jint)value; int32_t status = 0; HAL_SetCounterUpdateWhenEmpty((HAL_CounterHandle)id, value, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -424,12 +331,8 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_CounterJNI_getCounterStopped (JNIEnv* env, jclass, jint id) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI getCounterStopped"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; int32_t status = 0; jboolean returnValue = HAL_GetCounterStopped((HAL_CounterHandle)id, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; - COUNTERJNI_LOG(logDEBUG) << "getCounterStoppedResult = " << (jint)returnValue; CheckStatus(env, status); return returnValue; } @@ -443,14 +346,9 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_CounterJNI_getCounterDirection (JNIEnv* env, jclass, jint id) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI getCounterDirection"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; int32_t status = 0; jboolean returnValue = HAL_GetCounterDirection((HAL_CounterHandle)id, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; - COUNTERJNI_LOG(logDEBUG) << "getCounterDirectionResult = " - << (jint)returnValue; CheckStatus(env, status); return returnValue; } @@ -464,12 +362,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_CounterJNI_setCounterReverseDirection (JNIEnv* env, jclass, jint id, jboolean value) { - COUNTERJNI_LOG(logDEBUG) << "Calling COUNTERJNI setCounterReverseDirection"; - COUNTERJNI_LOG(logDEBUG) << "Counter Handle = " << (HAL_CounterHandle)id; - COUNTERJNI_LOG(logDEBUG) << "ReverseDirection = " << (jint)value; int32_t status = 0; HAL_SetCounterReverseDirection((HAL_CounterHandle)id, value, &status); - COUNTERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } diff --git a/hal/src/main/native/cpp/jni/DIOJNI.cpp b/hal/src/main/native/cpp/jni/DIOJNI.cpp index e21edcfc52..2ca5b70271 100644 --- a/hal/src/main/native/cpp/jni/DIOJNI.cpp +++ b/hal/src/main/native/cpp/jni/DIOJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -14,20 +14,10 @@ #include "hal/DIO.h" #include "hal/PWM.h" #include "hal/Ports.h" -#include "hal/cpp/Log.h" #include "hal/handles/HandlesInternal.h" using namespace frc; -// set the logging level -TLogLevel dioJNILogLevel = logWARNING; - -#define DIOJNI_LOG(level) \ - if (level > dioJNILogLevel) \ - ; \ - else \ - Log().Get(level) - extern "C" { /* @@ -39,14 +29,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_DIOJNI_initializeDIOPort (JNIEnv* env, jclass, jint id, jboolean input) { - DIOJNI_LOG(logDEBUG) << "Calling DIOJNI initializeDIOPort"; - DIOJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_PortHandle)id; - DIOJNI_LOG(logDEBUG) << "Input = " << (jint)input; int32_t status = 0; auto dio = HAL_InitializeDIOPort((HAL_PortHandle)id, static_cast(input), &status); - DIOJNI_LOG(logDEBUG) << "Status = " << status; - DIOJNI_LOG(logDEBUG) << "DIO Handle = " << dio; CheckStatusRange(env, status, 0, HAL_GetNumDigitalChannels(), hal::getPortHandleChannel((HAL_PortHandle)id)); return (jint)dio; @@ -61,8 +46,6 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_DIOJNI_checkDIOChannel (JNIEnv* env, jclass, jint channel) { - DIOJNI_LOG(logDEBUG) << "Calling DIOJNI checkDIOChannel"; - DIOJNI_LOG(logDEBUG) << "Channel = " << channel; return HAL_CheckDIOChannel(channel); } @@ -75,8 +58,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_DIOJNI_freeDIOPort (JNIEnv* env, jclass, jint id) { - DIOJNI_LOG(logDEBUG) << "Calling DIOJNI freeDIOPort"; - DIOJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_DigitalHandle)id; HAL_FreeDIOPort((HAL_DigitalHandle)id); } @@ -89,12 +70,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_DIOJNI_setDIO (JNIEnv* env, jclass, jint id, jshort value) { - // DIOJNI_LOG(logDEBUG) << "Calling DIOJNI setDIO"; - // DIOJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_DigitalHandle)id; - // DIOJNI_LOG(logDEBUG) << "Value = " << value; int32_t status = 0; HAL_SetDIO((HAL_DigitalHandle)id, value, &status); - // DIOJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -107,12 +84,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_DIOJNI_setDIODirection (JNIEnv* env, jclass, jint id, jboolean input) { - // DIOJNI_LOG(logDEBUG) << "Calling DIOJNI setDIO"; - // DIOJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_DigitalHandle)id; - // DIOJNI_LOG(logDEBUG) << "IsInput = " << input; int32_t status = 0; HAL_SetDIODirection((HAL_DigitalHandle)id, input, &status); - // DIOJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -125,12 +98,8 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_DIOJNI_getDIO (JNIEnv* env, jclass, jint id) { - // DIOJNI_LOG(logDEBUG) << "Calling DIOJNI getDIO"; - // DIOJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_DigitalHandle)id; int32_t status = 0; jboolean returnValue = HAL_GetDIO((HAL_DigitalHandle)id, &status); - // DIOJNI_LOG(logDEBUG) << "Status = " << status; - // DIOJNI_LOG(logDEBUG) << "getDIOResult = " << (jint)returnValue; CheckStatus(env, status); return returnValue; } @@ -144,12 +113,8 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_DIOJNI_getDIODirection (JNIEnv* env, jclass, jint id) { - DIOJNI_LOG(logDEBUG) << "Calling DIOJNI getDIODirection (RR upd)"; - // DIOJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_DigitalHandle)id; int32_t status = 0; jboolean returnValue = HAL_GetDIODirection((HAL_DigitalHandle)id, &status); - // DIOJNI_LOG(logDEBUG) << "Status = " << status; - DIOJNI_LOG(logDEBUG) << "getDIODirectionResult = " << (jint)returnValue; CheckStatus(env, status); return returnValue; } @@ -163,12 +128,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_DIOJNI_pulse (JNIEnv* env, jclass, jint id, jdouble value) { - DIOJNI_LOG(logDEBUG) << "Calling DIOJNI pulse (RR upd)"; - // DIOJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_DigitalHandle)id; - // DIOJNI_LOG(logDEBUG) << "Value = " << value; int32_t status = 0; HAL_Pulse((HAL_DigitalHandle)id, value, &status); - DIOJNI_LOG(logDEBUG) << "Did it work? Status = " << status; CheckStatus(env, status); } @@ -181,12 +142,8 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_DIOJNI_isPulsing (JNIEnv* env, jclass, jint id) { - DIOJNI_LOG(logDEBUG) << "Calling DIOJNI isPulsing (RR upd)"; - // DIOJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_DigitalHandle)id; int32_t status = 0; jboolean returnValue = HAL_IsPulsing((HAL_DigitalHandle)id, &status); - // DIOJNI_LOG(logDEBUG) << "Status = " << status; - DIOJNI_LOG(logDEBUG) << "isPulsingResult = " << (jint)returnValue; CheckStatus(env, status); return returnValue; } @@ -200,11 +157,8 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_DIOJNI_isAnyPulsing (JNIEnv* env, jclass) { - DIOJNI_LOG(logDEBUG) << "Calling DIOJNI isAnyPulsing (RR upd)"; int32_t status = 0; jboolean returnValue = HAL_IsAnyPulsing(&status); - // DIOJNI_LOG(logDEBUG) << "Status = " << status; - DIOJNI_LOG(logDEBUG) << "isAnyPulsingResult = " << (jint)returnValue; CheckStatus(env, status); return returnValue; } @@ -218,11 +172,8 @@ JNIEXPORT jshort JNICALL Java_edu_wpi_first_hal_DIOJNI_getLoopTiming (JNIEnv* env, jclass) { - DIOJNI_LOG(logDEBUG) << "Calling DIOJNI getLoopTimeing"; int32_t status = 0; jshort returnValue = HAL_GetPWMLoopTiming(&status); - DIOJNI_LOG(logDEBUG) << "Status = " << status; - DIOJNI_LOG(logDEBUG) << "LoopTiming = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -236,11 +187,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_DIOJNI_allocateDigitalPWM (JNIEnv* env, jclass) { - DIOJNI_LOG(logDEBUG) << "Calling DIOJNI allocateDigitalPWM"; int32_t status = 0; auto pwm = HAL_AllocateDigitalPWM(&status); - DIOJNI_LOG(logDEBUG) << "Status = " << status; - DIOJNI_LOG(logDEBUG) << "PWM Handle = " << pwm; CheckStatus(env, status); return (jint)pwm; } @@ -254,11 +202,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_DIOJNI_freeDigitalPWM (JNIEnv* env, jclass, jint id) { - DIOJNI_LOG(logDEBUG) << "Calling DIOJNI freeDigitalPWM"; - DIOJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalPWMHandle)id; int32_t status = 0; HAL_FreeDigitalPWM((HAL_DigitalPWMHandle)id, &status); - DIOJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -271,11 +216,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_DIOJNI_setDigitalPWMRate (JNIEnv* env, jclass, jdouble value) { - DIOJNI_LOG(logDEBUG) << "Calling DIOJNI setDigitalPWMRate"; - DIOJNI_LOG(logDEBUG) << "Rate= " << value; int32_t status = 0; HAL_SetDigitalPWMRate(value, &status); - DIOJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -288,12 +230,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_DIOJNI_setDigitalPWMDutyCycle (JNIEnv* env, jclass, jint id, jdouble value) { - DIOJNI_LOG(logDEBUG) << "Calling DIOJNI setDigitalPWMDutyCycle"; - DIOJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalPWMHandle)id; - DIOJNI_LOG(logDEBUG) << "DutyCycle= " << value; int32_t status = 0; HAL_SetDigitalPWMDutyCycle((HAL_DigitalPWMHandle)id, value, &status); - DIOJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -306,13 +244,9 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_DIOJNI_setDigitalPWMOutputChannel (JNIEnv* env, jclass, jint id, jint value) { - DIOJNI_LOG(logDEBUG) << "Calling DIOJNI setDigitalPWMOutputChannel"; - DIOJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalPWMHandle)id; - DIOJNI_LOG(logDEBUG) << "Channel= " << value; int32_t status = 0; HAL_SetDigitalPWMOutputChannel((HAL_DigitalPWMHandle)id, static_cast(value), &status); - DIOJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } diff --git a/hal/src/main/native/cpp/jni/EncoderJNI.cpp b/hal/src/main/native/cpp/jni/EncoderJNI.cpp index 10c4332050..5c410a5561 100644 --- a/hal/src/main/native/cpp/jni/EncoderJNI.cpp +++ b/hal/src/main/native/cpp/jni/EncoderJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -13,19 +13,9 @@ #include "edu_wpi_first_hal_EncoderJNI.h" #include "hal/Encoder.h" #include "hal/Errors.h" -#include "hal/cpp/Log.h" using namespace frc; -// set the logging level -TLogLevel encoderJNILogLevel = logWARNING; - -#define ENCODERJNI_LOG(level) \ - if (level > encoderJNILogLevel) \ - ; \ - else \ - Log().Get(level) - extern "C" { /* @@ -39,13 +29,6 @@ Java_edu_wpi_first_hal_EncoderJNI_initializeEncoder jint digitalSourceHandleB, jint analogTriggerTypeB, jboolean reverseDirection, jint encodingType) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI initializeEncoder"; - ENCODERJNI_LOG(logDEBUG) << "Source Handle A = " << digitalSourceHandleA; - ENCODERJNI_LOG(logDEBUG) << "Analog Trigger Type A = " << analogTriggerTypeA; - ENCODERJNI_LOG(logDEBUG) << "Source Handle B = " << digitalSourceHandleB; - ENCODERJNI_LOG(logDEBUG) << "Analog Trigger Type B = " << analogTriggerTypeB; - ENCODERJNI_LOG(logDEBUG) << "Reverse direction = " << (jint)reverseDirection; - ENCODERJNI_LOG(logDEBUG) << "EncodingType = " << encodingType; int32_t status = 0; auto encoder = HAL_InitializeEncoder( (HAL_Handle)digitalSourceHandleA, @@ -53,9 +36,6 @@ Java_edu_wpi_first_hal_EncoderJNI_initializeEncoder (HAL_Handle)digitalSourceHandleB, (HAL_AnalogTriggerType)analogTriggerTypeB, reverseDirection, (HAL_EncoderEncodingType)encodingType, &status); - - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; - ENCODERJNI_LOG(logDEBUG) << "ENCODER Handle = " << encoder; CheckStatusForceThrow(env, status); return (jint)encoder; } @@ -69,11 +49,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_EncoderJNI_freeEncoder (JNIEnv* env, jclass, jint id) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI freeEncoder"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; HAL_FreeEncoder((HAL_EncoderHandle)id, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -86,12 +63,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_EncoderJNI_getEncoder (JNIEnv* env, jclass, jint id) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoder"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; jint returnValue = HAL_GetEncoder((HAL_EncoderHandle)id, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; - ENCODERJNI_LOG(logDEBUG) << "getEncoderResult = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -105,12 +78,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_EncoderJNI_getEncoderRaw (JNIEnv* env, jclass, jint id) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderRaw"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; jint returnValue = HAL_GetEncoderRaw((HAL_EncoderHandle)id, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; - ENCODERJNI_LOG(logDEBUG) << "getRawEncoderResult = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -124,13 +93,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_EncoderJNI_getEncodingScaleFactor (JNIEnv* env, jclass, jint id) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncodingScaleFactor"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; jint returnValue = HAL_GetEncoderEncodingScale((HAL_EncoderHandle)id, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; - ENCODERJNI_LOG(logDEBUG) << "getEncodingScaleFactorResult = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -144,11 +109,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_EncoderJNI_resetEncoder (JNIEnv* env, jclass, jint id) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI resetEncoder"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; HAL_ResetEncoder((HAL_EncoderHandle)id, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -161,12 +123,8 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_hal_EncoderJNI_getEncoderPeriod (JNIEnv* env, jclass, jint id) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderPeriod"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; double returnValue = HAL_GetEncoderPeriod((HAL_EncoderHandle)id, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; - ENCODERJNI_LOG(logDEBUG) << "getEncoderPeriodEncoderResult = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -180,11 +138,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_EncoderJNI_setEncoderMaxPeriod (JNIEnv* env, jclass, jint id, jdouble value) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI setEncoderMaxPeriod"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; HAL_SetEncoderMaxPeriod((HAL_EncoderHandle)id, value, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -197,12 +152,8 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_EncoderJNI_getEncoderStopped (JNIEnv* env, jclass, jint id) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderStopped"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; jboolean returnValue = HAL_GetEncoderStopped((HAL_EncoderHandle)id, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; - ENCODERJNI_LOG(logDEBUG) << "getStoppedEncoderResult = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -216,13 +167,9 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_EncoderJNI_getEncoderDirection (JNIEnv* env, jclass, jint id) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderDirection"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; jboolean returnValue = HAL_GetEncoderDirection((HAL_EncoderHandle)id, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; - ENCODERJNI_LOG(logDEBUG) << "getDirectionEncoderResult = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -236,12 +183,8 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_hal_EncoderJNI_getEncoderDistance (JNIEnv* env, jclass, jint id) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderDistance"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; jdouble returnValue = HAL_GetEncoderDistance((HAL_EncoderHandle)id, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; - ENCODERJNI_LOG(logDEBUG) << "getDistanceEncoderResult = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -255,12 +198,8 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_hal_EncoderJNI_getEncoderRate (JNIEnv* env, jclass, jint id) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderRate"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; jdouble returnValue = HAL_GetEncoderRate((HAL_EncoderHandle)id, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; - ENCODERJNI_LOG(logDEBUG) << "getRateEncoderResult = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -274,11 +213,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_EncoderJNI_setEncoderMinRate (JNIEnv* env, jclass, jint id, jdouble value) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI setEncoderMinRate"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; HAL_SetEncoderMinRate((HAL_EncoderHandle)id, value, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -291,11 +227,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_EncoderJNI_setEncoderDistancePerPulse (JNIEnv* env, jclass, jint id, jdouble value) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI setEncoderDistancePerPulse"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; HAL_SetEncoderDistancePerPulse((HAL_EncoderHandle)id, value, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -308,11 +241,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_EncoderJNI_setEncoderReverseDirection (JNIEnv* env, jclass, jint id, jboolean value) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI setEncoderReverseDirection"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; HAL_SetEncoderReverseDirection((HAL_EncoderHandle)id, value, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -325,11 +255,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_EncoderJNI_setEncoderSamplesToAverage (JNIEnv* env, jclass, jint id, jint value) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI setEncoderSamplesToAverage"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; HAL_SetEncoderSamplesToAverage((HAL_EncoderHandle)id, value, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; if (status == PARAMETER_OUT_OF_RANGE) { ThrowBoundaryException(env, value, 1, 127); return; @@ -346,14 +273,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_EncoderJNI_getEncoderSamplesToAverage (JNIEnv* env, jclass, jint id) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderSamplesToAverage"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; jint returnValue = HAL_GetEncoderSamplesToAverage((HAL_EncoderHandle)id, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; - ENCODERJNI_LOG(logDEBUG) << "getEncoderSamplesToAverageResult = " - << returnValue; CheckStatus(env, status); return returnValue; } @@ -368,17 +290,11 @@ Java_edu_wpi_first_hal_EncoderJNI_setEncoderIndexSource (JNIEnv* env, jclass, jint id, jint digitalSourceHandle, jint analogTriggerType, jint type) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI setEncoderIndexSource"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; - ENCODERJNI_LOG(logDEBUG) << "Source Handle = " << digitalSourceHandle; - ENCODERJNI_LOG(logDEBUG) << "Analog Trigger Type = " << analogTriggerType; - ENCODERJNI_LOG(logDEBUG) << "IndexingType = " << type; int32_t status = 0; HAL_SetEncoderIndexSource((HAL_EncoderHandle)id, (HAL_Handle)digitalSourceHandle, (HAL_AnalogTriggerType)analogTriggerType, (HAL_EncoderIndexingType)type, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -391,13 +307,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_EncoderJNI_getEncoderFPGAIndex (JNIEnv* env, jclass, jint id) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderSamplesToAverage"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; jint returnValue = HAL_GetEncoderFPGAIndex((HAL_EncoderHandle)id, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; - ENCODERJNI_LOG(logDEBUG) << "getEncoderSamplesToAverageResult = " - << returnValue; CheckStatus(env, status); return returnValue; } @@ -411,14 +322,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_EncoderJNI_getEncoderEncodingScale (JNIEnv* env, jclass, jint id) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderSamplesToAverage"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; jint returnValue = HAL_GetEncoderEncodingScale((HAL_EncoderHandle)id, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; - ENCODERJNI_LOG(logDEBUG) << "getEncoderSamplesToAverageResult = " - << returnValue; CheckStatus(env, status); return returnValue; } @@ -432,14 +338,9 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_hal_EncoderJNI_getEncoderDecodingScaleFactor (JNIEnv* env, jclass, jint id) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderSamplesToAverage"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; jdouble returnValue = HAL_GetEncoderDecodingScaleFactor((HAL_EncoderHandle)id, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; - ENCODERJNI_LOG(logDEBUG) << "getEncoderSamplesToAverageResult = " - << returnValue; CheckStatus(env, status); return returnValue; } @@ -453,14 +354,9 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_hal_EncoderJNI_getEncoderDistancePerPulse (JNIEnv* env, jclass, jint id) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderSamplesToAverage"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; jdouble returnValue = HAL_GetEncoderDistancePerPulse((HAL_EncoderHandle)id, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; - ENCODERJNI_LOG(logDEBUG) << "getEncoderSamplesToAverageResult = " - << returnValue; CheckStatus(env, status); return returnValue; } @@ -474,13 +370,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_EncoderJNI_getEncoderEncodingType (JNIEnv* env, jclass, jint id) { - ENCODERJNI_LOG(logDEBUG) << "Calling ENCODERJNI getEncoderSamplesToAverage"; - ENCODERJNI_LOG(logDEBUG) << "Encoder Handle = " << (HAL_EncoderHandle)id; int32_t status = 0; jint returnValue = HAL_GetEncoderEncodingType((HAL_EncoderHandle)id, &status); - ENCODERJNI_LOG(logDEBUG) << "Status = " << status; - ENCODERJNI_LOG(logDEBUG) << "getEncoderSamplesToAverageResult = " - << returnValue; CheckStatus(env, status); return returnValue; } diff --git a/hal/src/main/native/cpp/jni/HAL.cpp b/hal/src/main/native/cpp/jni/HAL.cpp index cc5f7cf03f..867f655bd9 100644 --- a/hal/src/main/native/cpp/jni/HAL.cpp +++ b/hal/src/main/native/cpp/jni/HAL.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -17,20 +17,10 @@ #include "HALUtil.h" #include "edu_wpi_first_hal_HAL.h" #include "hal/DriverStation.h" -#include "hal/cpp/Log.h" using namespace frc; using namespace wpi::java; -// set the logging level -static TLogLevel netCommLogLevel = logWARNING; - -#define NETCOMM_LOG(level) \ - if (level > netCommLogLevel) \ - ; \ - else \ - Log().Get(level) - extern "C" { /* @@ -116,11 +106,6 @@ Java_edu_wpi_first_hal_HAL_report jint paramContext, jstring paramFeature) { JStringRef featureStr{paramEnv, paramFeature}; - NETCOMM_LOG(logDEBUG) << "Calling HAL report " - << "res:" << paramResource - << " instance:" << paramInstanceNumber - << " context:" << paramContext - << " feature:" << featureStr.c_str(); jint returnValue = HAL_Report(paramResource, paramInstanceNumber, paramContext, featureStr.c_str()); return returnValue; @@ -135,7 +120,6 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_HAL_nativeGetControlWord (JNIEnv*, jclass) { - NETCOMM_LOG(logDEBUG) << "Calling HAL Control Word"; static_assert(sizeof(HAL_ControlWord) == sizeof(jint), "Java int must match the size of control word"); HAL_ControlWord controlWord; @@ -155,7 +139,6 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_HAL_nativeGetAllianceStation (JNIEnv*, jclass) { - NETCOMM_LOG(logDEBUG) << "Calling HAL Alliance Station"; int32_t status = 0; auto allianceStation = HAL_GetAllianceStation(&status); return static_cast(allianceStation); @@ -170,7 +153,6 @@ JNIEXPORT jshort JNICALL Java_edu_wpi_first_hal_HAL_getJoystickAxes (JNIEnv* env, jclass, jbyte joystickNum, jfloatArray axesArray) { - NETCOMM_LOG(logDEBUG) << "Calling HALJoystickAxes"; HAL_JoystickAxes axes; HAL_GetJoystickAxes(joystickNum, &axes); @@ -200,7 +182,6 @@ JNIEXPORT jshort JNICALL Java_edu_wpi_first_hal_HAL_getJoystickPOVs (JNIEnv* env, jclass, jbyte joystickNum, jshortArray povsArray) { - NETCOMM_LOG(logDEBUG) << "Calling HALJoystickPOVs"; HAL_JoystickPOVs povs; HAL_GetJoystickPOVs(joystickNum, &povs); @@ -230,15 +211,11 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_HAL_getJoystickButtons (JNIEnv* env, jclass, jbyte joystickNum, jobject count) { - NETCOMM_LOG(logDEBUG) << "Calling HALJoystickButtons"; HAL_JoystickButtons joystickButtons; HAL_GetJoystickButtons(joystickNum, &joystickButtons); jbyte* countPtr = reinterpret_cast(env->GetDirectBufferAddress(count)); - NETCOMM_LOG(logDEBUG) << "Buttons = " << joystickButtons.buttons; - NETCOMM_LOG(logDEBUG) << "Count = " << (jint)joystickButtons.count; *countPtr = joystickButtons.count; - NETCOMM_LOG(logDEBUG) << "CountBuffer = " << (jint)*countPtr; return joystickButtons.buttons; } @@ -252,10 +229,6 @@ Java_edu_wpi_first_hal_HAL_setJoystickOutputs (JNIEnv*, jclass, jbyte port, jint outputs, jshort leftRumble, jshort rightRumble) { - NETCOMM_LOG(logDEBUG) << "Calling HAL_SetJoystickOutputs on port " << port; - NETCOMM_LOG(logDEBUG) << "Outputs: " << outputs; - NETCOMM_LOG(logDEBUG) << "Left Rumble: " << leftRumble - << " Right Rumble: " << rightRumble; return HAL_SetJoystickOutputs(port, outputs, leftRumble, rightRumble); } @@ -268,7 +241,6 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_HAL_getJoystickIsXbox (JNIEnv*, jclass, jbyte port) { - NETCOMM_LOG(logDEBUG) << "Calling HAL_GetJoystickIsXbox"; return HAL_GetJoystickIsXbox(port); } @@ -281,7 +253,6 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_HAL_getJoystickType (JNIEnv*, jclass, jbyte port) { - NETCOMM_LOG(logDEBUG) << "Calling HAL_GetJoystickType"; return HAL_GetJoystickType(port); } @@ -294,7 +265,6 @@ JNIEXPORT jstring JNICALL Java_edu_wpi_first_hal_HAL_getJoystickName (JNIEnv* env, jclass, jbyte port) { - NETCOMM_LOG(logDEBUG) << "Calling HAL_GetJoystickName"; char* joystickName = HAL_GetJoystickName(port); jstring str = MakeJString(env, joystickName); HAL_FreeJoystickName(joystickName); @@ -310,7 +280,6 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_HAL_getJoystickAxisType (JNIEnv*, jclass, jbyte joystickNum, jbyte axis) { - NETCOMM_LOG(logDEBUG) << "Calling HAL_GetJoystickAxisType"; return HAL_GetJoystickAxisType(joystickNum, axis); } @@ -436,9 +405,6 @@ Java_edu_wpi_first_hal_HAL_sendError JStringRef locationStr{env, location}; JStringRef callStackStr{env, callStack}; - NETCOMM_LOG(logDEBUG) << "Send Error: " << detailsStr.c_str(); - NETCOMM_LOG(logDEBUG) << "Location: " << locationStr.c_str(); - NETCOMM_LOG(logDEBUG) << "Call Stack: " << callStackStr.c_str(); jint returnValue = HAL_SendError(isError, errorCode, isLVCode, detailsStr.c_str(), locationStr.c_str(), callStackStr.c_str(), printMsg); @@ -454,11 +420,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_HAL_getPortWithModule (JNIEnv* env, jclass, jbyte module, jbyte channel) { - // FILE_LOG(logDEBUG) << "Calling HAL getPortWithModlue"; - // FILE_LOG(logDEBUG) << "Module = " << (jint)module; - // FILE_LOG(logDEBUG) << "Channel = " << (jint)channel; HAL_PortHandle port = HAL_GetPortWithModule(module, channel); - // FILE_LOG(logDEBUG) << "Port Handle = " << port; return (jint)port; } @@ -471,11 +433,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_HAL_getPort (JNIEnv* env, jclass, jbyte channel) { - // FILE_LOG(logDEBUG) << "Calling HAL getPortWithModlue"; - // FILE_LOG(logDEBUG) << "Module = " << (jint)module; - // FILE_LOG(logDEBUG) << "Channel = " << (jint)channel; HAL_PortHandle port = HAL_GetPort(channel); - // FILE_LOG(logDEBUG) << "Port Handle = " << port; return (jint)port; } diff --git a/hal/src/main/native/cpp/jni/HALUtil.cpp b/hal/src/main/native/cpp/jni/HALUtil.cpp index f9b5689ebb..46c068b544 100644 --- a/hal/src/main/native/cpp/jni/HALUtil.cpp +++ b/hal/src/main/native/cpp/jni/HALUtil.cpp @@ -24,19 +24,9 @@ #include "hal/DriverStation.h" #include "hal/Errors.h" #include "hal/HAL.h" -#include "hal/cpp/Log.h" using namespace wpi::java; -// set the logging level -TLogLevel halUtilLogLevel = logWARNING; - -#define HALUTIL_LOG(level) \ - if (level > halUtilLogLevel) \ - ; \ - else \ - Log().Get(level) - #define kRioStatusOffset -63000 #define kRioStatusSuccess 0 #define kRIOStatusBufferInvalidSize (kRioStatusOffset - 80) @@ -300,9 +290,6 @@ extern "C" { JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) { jvm = vm; - // set our logging level - Log::ReportingLevel() = logDEBUG; - JNIEnv* env; if (vm->GetEnv(reinterpret_cast(&env), JNI_VERSION_1_6) != JNI_OK) return JNI_ERR; @@ -346,11 +333,8 @@ JNIEXPORT jshort JNICALL Java_edu_wpi_first_hal_HALUtil_getFPGAVersion (JNIEnv* env, jclass) { - HALUTIL_LOG(logDEBUG) << "Calling HALUtil getFPGAVersion"; int32_t status = 0; jshort returnValue = HAL_GetFPGAVersion(&status); - HALUTIL_LOG(logDEBUG) << "Status = " << status; - HALUTIL_LOG(logDEBUG) << "FPGAVersion = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -364,11 +348,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_HALUtil_getFPGARevision (JNIEnv* env, jclass) { - HALUTIL_LOG(logDEBUG) << "Calling HALUtil getFPGARevision"; int32_t status = 0; jint returnValue = HAL_GetFPGARevision(&status); - HALUTIL_LOG(logDEBUG) << "Status = " << status; - HALUTIL_LOG(logDEBUG) << "FPGARevision = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -382,11 +363,8 @@ JNIEXPORT jlong JNICALL Java_edu_wpi_first_hal_HALUtil_getFPGATime (JNIEnv* env, jclass) { - // HALUTIL_LOG(logDEBUG) << "Calling HALUtil getFPGATime"; int32_t status = 0; jlong returnValue = HAL_GetFPGATime(&status); - // HALUTIL_LOG(logDEBUG) << "Status = " << status; - // HALUTIL_LOG(logDEBUG) << "FPGATime = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -400,9 +378,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_HALUtil_getHALRuntimeType (JNIEnv* env, jclass) { - // HALUTIL_LOG(logDEBUG) << "Calling HALUtil getHALRuntimeType"; jint returnValue = HAL_GetRuntimeType(); - // HALUTIL_LOG(logDEBUG) << "RuntimeType = " << returnValue; return returnValue; } @@ -415,11 +391,8 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_HALUtil_getFPGAButton (JNIEnv* env, jclass) { - // HALUTIL_LOG(logDEBUG) << "Calling HALUtil getFPGATime"; int32_t status = 0; jboolean returnValue = HAL_GetFPGAButton(&status); - // HALUTIL_LOG(logDEBUG) << "Status = " << status; - // HALUTIL_LOG(logDEBUG) << "FPGATime = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -434,8 +407,6 @@ Java_edu_wpi_first_hal_HALUtil_getHALErrorMessage (JNIEnv* paramEnv, jclass, jint paramId) { const char* msg = HAL_GetErrorMessage(paramId); - HALUTIL_LOG(logDEBUG) << "Calling HALUtil HAL_GetErrorMessage id=" << paramId - << " msg=" << msg; return MakeJString(paramEnv, msg); } @@ -461,8 +432,6 @@ Java_edu_wpi_first_hal_HALUtil_getHALstrerror (JNIEnv* env, jclass, jint errorCode) { const char* msg = std::strerror(errno); - HALUTIL_LOG(logDEBUG) << "Calling HALUtil getHALstrerror errorCode=" - << errorCode << " msg=" << msg; return MakeJString(env, msg); } diff --git a/hal/src/main/native/cpp/jni/I2CJNI.cpp b/hal/src/main/native/cpp/jni/I2CJNI.cpp index 9dafd4ae09..7812bdb7e7 100644 --- a/hal/src/main/native/cpp/jni/I2CJNI.cpp +++ b/hal/src/main/native/cpp/jni/I2CJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -14,20 +14,10 @@ #include "HALUtil.h" #include "edu_wpi_first_hal_I2CJNI.h" #include "hal/I2C.h" -#include "hal/cpp/Log.h" using namespace frc; using namespace wpi::java; -// set the logging level -TLogLevel i2cJNILogLevel = logWARNING; - -#define I2CJNI_LOG(level) \ - if (level > i2cJNILogLevel) \ - ; \ - else \ - Log().Get(level) - extern "C" { /* @@ -39,11 +29,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_I2CJNI_i2CInitialize (JNIEnv* env, jclass, jint port) { - I2CJNI_LOG(logDEBUG) << "Calling I2CJNI i2CInititalize"; - I2CJNI_LOG(logDEBUG) << "Port: " << port; int32_t status = 0; HAL_InitializeI2C(static_cast(port), &status); - I2CJNI_LOG(logDEBUG) << "Status = " << status; CheckStatusForceThrow(env, status); } @@ -57,26 +44,16 @@ Java_edu_wpi_first_hal_I2CJNI_i2CTransaction (JNIEnv* env, jclass, jint port, jbyte address, jobject dataToSend, jbyte sendSize, jobject dataReceived, jbyte receiveSize) { - I2CJNI_LOG(logDEBUG) << "Calling I2CJNI i2CTransaction"; - I2CJNI_LOG(logDEBUG) << "Port = " << port; - I2CJNI_LOG(logDEBUG) << "Address = " << (jint)address; uint8_t* dataToSendPtr = nullptr; if (dataToSend != 0) { dataToSendPtr = reinterpret_cast(env->GetDirectBufferAddress(dataToSend)); } - I2CJNI_LOG(logDEBUG) << "DataToSendPtr = " - << reinterpret_cast(dataToSendPtr); - I2CJNI_LOG(logDEBUG) << "SendSize = " << (jint)sendSize; uint8_t* dataReceivedPtr = reinterpret_cast(env->GetDirectBufferAddress(dataReceived)); - I2CJNI_LOG(logDEBUG) << "DataReceivedPtr = " - << reinterpret_cast(dataReceivedPtr); - I2CJNI_LOG(logDEBUG) << "ReceiveSize = " << (jint)receiveSize; jint returnValue = HAL_TransactionI2C(static_cast(port), address, dataToSendPtr, sendSize, dataReceivedPtr, receiveSize); - I2CJNI_LOG(logDEBUG) << "ReturnValue = " << returnValue; return returnValue; } @@ -90,13 +67,8 @@ Java_edu_wpi_first_hal_I2CJNI_i2CTransactionB (JNIEnv* env, jclass, jint port, jbyte address, jbyteArray dataToSend, jbyte sendSize, jbyteArray dataReceived, jbyte receiveSize) { - I2CJNI_LOG(logDEBUG) << "Calling I2CJNI i2CTransactionB"; - I2CJNI_LOG(logDEBUG) << "Port = " << port; - I2CJNI_LOG(logDEBUG) << "Address = " << (jint)address; - I2CJNI_LOG(logDEBUG) << "SendSize = " << (jint)sendSize; wpi::SmallVector recvBuf; recvBuf.resize(receiveSize); - I2CJNI_LOG(logDEBUG) << "ReceiveSize = " << (jint)receiveSize; jint returnValue = HAL_TransactionI2C(static_cast(port), address, reinterpret_cast( @@ -104,7 +76,6 @@ Java_edu_wpi_first_hal_I2CJNI_i2CTransactionB sendSize, recvBuf.data(), receiveSize); env->SetByteArrayRegion(dataReceived, 0, receiveSize, reinterpret_cast(recvBuf.data())); - I2CJNI_LOG(logDEBUG) << "ReturnValue = " << returnValue; return returnValue; } @@ -118,20 +89,14 @@ Java_edu_wpi_first_hal_I2CJNI_i2CWrite (JNIEnv* env, jclass, jint port, jbyte address, jobject dataToSend, jbyte sendSize) { - I2CJNI_LOG(logDEBUG) << "Calling I2CJNI i2CWrite"; - I2CJNI_LOG(logDEBUG) << "Port = " << port; - I2CJNI_LOG(logDEBUG) << "Address = " << (jint)address; uint8_t* dataToSendPtr = nullptr; if (dataToSend != 0) { dataToSendPtr = reinterpret_cast(env->GetDirectBufferAddress(dataToSend)); } - I2CJNI_LOG(logDEBUG) << "DataToSendPtr = " << dataToSendPtr; - I2CJNI_LOG(logDEBUG) << "SendSize = " << (jint)sendSize; jint returnValue = HAL_WriteI2C(static_cast(port), address, dataToSendPtr, sendSize); - I2CJNI_LOG(logDEBUG) << "ReturnValue = " << (jint)returnValue; return returnValue; } @@ -145,16 +110,11 @@ Java_edu_wpi_first_hal_I2CJNI_i2CWriteB (JNIEnv* env, jclass, jint port, jbyte address, jbyteArray dataToSend, jbyte sendSize) { - I2CJNI_LOG(logDEBUG) << "Calling I2CJNI i2CWrite"; - I2CJNI_LOG(logDEBUG) << "Port = " << port; - I2CJNI_LOG(logDEBUG) << "Address = " << (jint)address; - I2CJNI_LOG(logDEBUG) << "SendSize = " << (jint)sendSize; jint returnValue = HAL_WriteI2C(static_cast(port), address, reinterpret_cast( JByteArrayRef(env, dataToSend).array().data()), sendSize); - I2CJNI_LOG(logDEBUG) << "ReturnValue = " << (jint)returnValue; return returnValue; } @@ -168,16 +128,10 @@ Java_edu_wpi_first_hal_I2CJNI_i2CRead (JNIEnv* env, jclass, jint port, jbyte address, jobject dataReceived, jbyte receiveSize) { - I2CJNI_LOG(logDEBUG) << "Calling I2CJNI i2CRead"; - I2CJNI_LOG(logDEBUG) << "Port = " << port; - I2CJNI_LOG(logDEBUG) << "Address = " << address; uint8_t* dataReceivedPtr = reinterpret_cast(env->GetDirectBufferAddress(dataReceived)); - I2CJNI_LOG(logDEBUG) << "DataReceivedPtr = " << dataReceivedPtr; - I2CJNI_LOG(logDEBUG) << "ReceiveSize = " << receiveSize; jint returnValue = HAL_ReadI2C(static_cast(port), address, dataReceivedPtr, receiveSize); - I2CJNI_LOG(logDEBUG) << "ReturnValue = " << returnValue; return returnValue; } @@ -191,17 +145,12 @@ Java_edu_wpi_first_hal_I2CJNI_i2CReadB (JNIEnv* env, jclass, jint port, jbyte address, jbyteArray dataReceived, jbyte receiveSize) { - I2CJNI_LOG(logDEBUG) << "Calling I2CJNI i2CRead"; - I2CJNI_LOG(logDEBUG) << "Port = " << port; - I2CJNI_LOG(logDEBUG) << "Address = " << address; - I2CJNI_LOG(logDEBUG) << "ReceiveSize = " << receiveSize; wpi::SmallVector recvBuf; recvBuf.resize(receiveSize); jint returnValue = HAL_ReadI2C(static_cast(port), address, recvBuf.data(), receiveSize); env->SetByteArrayRegion(dataReceived, 0, receiveSize, reinterpret_cast(recvBuf.data())); - I2CJNI_LOG(logDEBUG) << "ReturnValue = " << returnValue; return returnValue; } @@ -214,7 +163,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_I2CJNI_i2CClose (JNIEnv*, jclass, jint port) { - I2CJNI_LOG(logDEBUG) << "Calling I2CJNI i2CClose"; HAL_CloseI2C(static_cast(port)); } diff --git a/hal/src/main/native/cpp/jni/InterruptJNI.cpp b/hal/src/main/native/cpp/jni/InterruptJNI.cpp index 805af3ec7c..e3a783d85a 100644 --- a/hal/src/main/native/cpp/jni/InterruptJNI.cpp +++ b/hal/src/main/native/cpp/jni/InterruptJNI.cpp @@ -17,18 +17,9 @@ #include "HALUtil.h" #include "edu_wpi_first_hal_InterruptJNI.h" #include "hal/Interrupts.h" -#include "hal/cpp/Log.h" using namespace frc; -TLogLevel interruptJNILogLevel = logERROR; - -#define INTERRUPTJNI_LOG(level) \ - if (level > interruptJNILogLevel) \ - ; \ - else \ - Log().Get(level) - // Thread where callbacks are actually performed. // // JNI's AttachCurrentThread() creates a Java Thread object on every @@ -129,15 +120,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_InterruptJNI_initializeInterrupts (JNIEnv* env, jclass, jboolean watcher) { - INTERRUPTJNI_LOG(logDEBUG) << "Calling INTERRUPTJNI initializeInterrupts"; - INTERRUPTJNI_LOG(logDEBUG) << "watcher = " << static_cast(watcher); - int32_t status = 0; HAL_InterruptHandle interrupt = HAL_InitializeInterrupts(watcher, &status); - INTERRUPTJNI_LOG(logDEBUG) << "Interrupt Handle = " << interrupt; - INTERRUPTJNI_LOG(logDEBUG) << "Status = " << status; - CheckStatusForceThrow(env, status); return (jint)interrupt; } @@ -151,10 +136,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_InterruptJNI_cleanInterrupts (JNIEnv* env, jclass, jint interruptHandle) { - INTERRUPTJNI_LOG(logDEBUG) << "Calling INTERRUPTJNI cleanInterrupts"; - INTERRUPTJNI_LOG(logDEBUG) - << "Interrupt Handle = " << (HAL_InterruptHandle)interruptHandle; - int32_t status = 0; auto param = HAL_CleanInterrupts((HAL_InterruptHandle)interruptHandle, &status); @@ -162,8 +143,6 @@ Java_edu_wpi_first_hal_InterruptJNI_cleanInterrupts delete static_cast(param); } - INTERRUPTJNI_LOG(logDEBUG) << "Status = " << status; - // ignore status, as an invalid handle just needs to be ignored. } @@ -177,16 +156,10 @@ Java_edu_wpi_first_hal_InterruptJNI_waitForInterrupt (JNIEnv* env, jclass, jint interruptHandle, jdouble timeout, jboolean ignorePrevious) { - INTERRUPTJNI_LOG(logDEBUG) << "Calling INTERRUPTJNI waitForInterrupt"; - INTERRUPTJNI_LOG(logDEBUG) - << "Interrupt Handle = " << (HAL_InterruptHandle)interruptHandle; - int32_t status = 0; int32_t result = HAL_WaitForInterrupt((HAL_InterruptHandle)interruptHandle, timeout, ignorePrevious, &status); - INTERRUPTJNI_LOG(logDEBUG) << "Status = " << status; - CheckStatus(env, status); return result; } @@ -200,15 +173,9 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_InterruptJNI_enableInterrupts (JNIEnv* env, jclass, jint interruptHandle) { - INTERRUPTJNI_LOG(logDEBUG) << "Calling INTERRUPTJNI enableInterrupts"; - INTERRUPTJNI_LOG(logDEBUG) - << "Interrupt Handle = " << (HAL_InterruptHandle)interruptHandle; - int32_t status = 0; HAL_EnableInterrupts((HAL_InterruptHandle)interruptHandle, &status); - INTERRUPTJNI_LOG(logDEBUG) << "Status = " << status; - CheckStatus(env, status); } @@ -221,15 +188,9 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_InterruptJNI_disableInterrupts (JNIEnv* env, jclass, jint interruptHandle) { - INTERRUPTJNI_LOG(logDEBUG) << "Calling INTERRUPTJNI disableInterrupts"; - INTERRUPTJNI_LOG(logDEBUG) - << "Interrupt Handle = " << (HAL_InterruptHandle)interruptHandle; - int32_t status = 0; HAL_DisableInterrupts((HAL_InterruptHandle)interruptHandle, &status); - INTERRUPTJNI_LOG(logDEBUG) << "Status = " << status; - CheckStatus(env, status); } @@ -242,16 +203,10 @@ JNIEXPORT jlong JNICALL Java_edu_wpi_first_hal_InterruptJNI_readInterruptRisingTimestamp (JNIEnv* env, jclass, jint interruptHandle) { - INTERRUPTJNI_LOG(logDEBUG) - << "Calling INTERRUPTJNI readInterruptRisingTimestamp"; - INTERRUPTJNI_LOG(logDEBUG) - << "Interrupt Handle = " << (HAL_InterruptHandle)interruptHandle; - int32_t status = 0; jlong timeStamp = HAL_ReadInterruptRisingTimestamp( (HAL_InterruptHandle)interruptHandle, &status); - INTERRUPTJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); return timeStamp; } @@ -265,16 +220,10 @@ JNIEXPORT jlong JNICALL Java_edu_wpi_first_hal_InterruptJNI_readInterruptFallingTimestamp (JNIEnv* env, jclass, jint interruptHandle) { - INTERRUPTJNI_LOG(logDEBUG) - << "Calling INTERRUPTJNI readInterruptFallingTimestamp"; - INTERRUPTJNI_LOG(logDEBUG) - << "Interrupt Handle = " << (HAL_InterruptHandle)interruptHandle; - int32_t status = 0; jlong timeStamp = HAL_ReadInterruptFallingTimestamp( (HAL_InterruptHandle)interruptHandle, &status); - INTERRUPTJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); return timeStamp; } @@ -289,18 +238,11 @@ Java_edu_wpi_first_hal_InterruptJNI_requestInterrupts (JNIEnv* env, jclass, jint interruptHandle, jint digitalSourceHandle, jint analogTriggerType) { - INTERRUPTJNI_LOG(logDEBUG) << "Calling INTERRUPTJNI requestInterrupts"; - INTERRUPTJNI_LOG(logDEBUG) - << "Interrupt Handle = " << (HAL_InterruptHandle)interruptHandle; - INTERRUPTJNI_LOG(logDEBUG) << "digitalSourceHandle = " << digitalSourceHandle; - INTERRUPTJNI_LOG(logDEBUG) << "analogTriggerType = " << analogTriggerType; - int32_t status = 0; HAL_RequestInterrupts((HAL_InterruptHandle)interruptHandle, (HAL_Handle)digitalSourceHandle, (HAL_AnalogTriggerType)analogTriggerType, &status); - INTERRUPTJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -313,21 +255,13 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_InterruptJNI_attachInterruptHandler (JNIEnv* env, jclass, jint interruptHandle, jobject handler, jobject param) { - INTERRUPTJNI_LOG(logDEBUG) << "Calling INTERRUPTJNI attachInterruptHandler"; - INTERRUPTJNI_LOG(logDEBUG) - << "Interrupt Handle = " << (HAL_InterruptHandle)interruptHandle; - jclass cls = env->GetObjectClass(handler); - INTERRUPTJNI_LOG(logDEBUG) << "class = " << cls; if (cls == 0) { - INTERRUPTJNI_LOG(logERROR) << "Error getting java class"; assert(false); return; } jmethodID mid = env->GetMethodID(cls, "apply", "(ILjava/lang/Object;)V"); - INTERRUPTJNI_LOG(logDEBUG) << "method = " << mid; if (mid == 0) { - INTERRUPTJNI_LOG(logERROR) << "Error getting java method ID"; assert(false); return; } @@ -336,13 +270,10 @@ Java_edu_wpi_first_hal_InterruptJNI_attachInterruptHandler intr->Start(); intr->SetFunc(env, handler, mid, param); - INTERRUPTJNI_LOG(logDEBUG) << "InterruptThreadJNI Ptr = " << intr; - int32_t status = 0; HAL_AttachInterruptHandler((HAL_InterruptHandle)interruptHandle, interruptHandler, intr, &status); - INTERRUPTJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -356,19 +287,10 @@ Java_edu_wpi_first_hal_InterruptJNI_setInterruptUpSourceEdge (JNIEnv* env, jclass, jint interruptHandle, jboolean risingEdge, jboolean fallingEdge) { - INTERRUPTJNI_LOG(logDEBUG) << "Calling INTERRUPTJNI setInterruptUpSourceEdge"; - INTERRUPTJNI_LOG(logDEBUG) - << "Interrupt Handle = " << (HAL_InterruptHandle)interruptHandle; - INTERRUPTJNI_LOG(logDEBUG) - << "Rising Edge = " << static_cast(risingEdge); - INTERRUPTJNI_LOG(logDEBUG) - << "Falling Edge = " << static_cast(fallingEdge); - int32_t status = 0; HAL_SetInterruptUpSourceEdge((HAL_InterruptHandle)interruptHandle, risingEdge, fallingEdge, &status); - INTERRUPTJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } diff --git a/hal/src/main/native/cpp/jni/NotifierJNI.cpp b/hal/src/main/native/cpp/jni/NotifierJNI.cpp index 61fe32f52a..588614e8be 100644 --- a/hal/src/main/native/cpp/jni/NotifierJNI.cpp +++ b/hal/src/main/native/cpp/jni/NotifierJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -13,19 +13,9 @@ #include "HALUtil.h" #include "edu_wpi_first_hal_NotifierJNI.h" #include "hal/Notifier.h" -#include "hal/cpp/Log.h" using namespace frc; -// set the logging level -TLogLevel notifierJNILogLevel = logWARNING; - -#define NOTIFIERJNI_LOG(level) \ - if (level > notifierJNILogLevel) \ - ; \ - else \ - Log().Get(level) - extern "C" { /* @@ -37,14 +27,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_NotifierJNI_initializeNotifier (JNIEnv* env, jclass) { - NOTIFIERJNI_LOG(logDEBUG) << "Calling NOTIFIERJNI initializeNotifier"; - int32_t status = 0; HAL_NotifierHandle notifierHandle = HAL_InitializeNotifier(&status); - NOTIFIERJNI_LOG(logDEBUG) << "Notifier Handle = " << notifierHandle; - NOTIFIERJNI_LOG(logDEBUG) << "Status = " << status; - if (notifierHandle <= 0 || !CheckStatusForceThrow(env, status)) { return 0; // something went wrong in HAL } @@ -61,13 +46,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_NotifierJNI_stopNotifier (JNIEnv* env, jclass cls, jint notifierHandle) { - NOTIFIERJNI_LOG(logDEBUG) << "Calling NOTIFIERJNI stopNotifier"; - - NOTIFIERJNI_LOG(logDEBUG) << "Notifier Handle = " << notifierHandle; - int32_t status = 0; HAL_StopNotifier((HAL_NotifierHandle)notifierHandle, &status); - NOTIFIERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -80,13 +60,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_NotifierJNI_cleanNotifier (JNIEnv* env, jclass, jint notifierHandle) { - NOTIFIERJNI_LOG(logDEBUG) << "Calling NOTIFIERJNI cleanNotifier"; - - NOTIFIERJNI_LOG(logDEBUG) << "Notifier Handle = " << notifierHandle; - int32_t status = 0; HAL_CleanNotifier((HAL_NotifierHandle)notifierHandle, &status); - NOTIFIERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -99,16 +74,9 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_NotifierJNI_updateNotifierAlarm (JNIEnv* env, jclass cls, jint notifierHandle, jlong triggerTime) { - NOTIFIERJNI_LOG(logDEBUG) << "Calling NOTIFIERJNI updateNotifierAlarm"; - - NOTIFIERJNI_LOG(logDEBUG) << "Notifier Handle = " << notifierHandle; - - NOTIFIERJNI_LOG(logDEBUG) << "triggerTime = " << triggerTime; - int32_t status = 0; HAL_UpdateNotifierAlarm((HAL_NotifierHandle)notifierHandle, static_cast(triggerTime), &status); - NOTIFIERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -121,13 +89,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_NotifierJNI_cancelNotifierAlarm (JNIEnv* env, jclass cls, jint notifierHandle) { - NOTIFIERJNI_LOG(logDEBUG) << "Calling NOTIFIERJNI cancelNotifierAlarm"; - - NOTIFIERJNI_LOG(logDEBUG) << "Notifier Handle = " << notifierHandle; - int32_t status = 0; HAL_CancelNotifierAlarm((HAL_NotifierHandle)notifierHandle, &status); - NOTIFIERJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -140,15 +103,10 @@ JNIEXPORT jlong JNICALL Java_edu_wpi_first_hal_NotifierJNI_waitForNotifierAlarm (JNIEnv* env, jclass cls, jint notifierHandle) { - NOTIFIERJNI_LOG(logDEBUG) << "Calling NOTIFIERJNI waitForNotifierAlarm"; - - NOTIFIERJNI_LOG(logDEBUG) << "Notifier Handle = " << notifierHandle; - int32_t status = 0; uint64_t time = HAL_WaitForNotifierAlarm((HAL_NotifierHandle)notifierHandle, &status); - NOTIFIERJNI_LOG(logDEBUG) << "Status = " << status; - NOTIFIERJNI_LOG(logDEBUG) << "Time = " << time; + CheckStatus(env, status); return (jlong)time; diff --git a/hal/src/main/native/cpp/jni/PWMJNI.cpp b/hal/src/main/native/cpp/jni/PWMJNI.cpp index 1509f9476c..80293c448e 100644 --- a/hal/src/main/native/cpp/jni/PWMJNI.cpp +++ b/hal/src/main/native/cpp/jni/PWMJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -14,20 +14,10 @@ #include "hal/DIO.h" #include "hal/PWM.h" #include "hal/Ports.h" -#include "hal/cpp/Log.h" #include "hal/handles/HandlesInternal.h" using namespace frc; -// set the logging level -TLogLevel pwmJNILogLevel = logWARNING; - -#define PWMJNI_LOG(level) \ - if (level > pwmJNILogLevel) \ - ; \ - else \ - Log().Get(level) - extern "C" { /* @@ -39,12 +29,8 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PWMJNI_initializePWMPort (JNIEnv* env, jclass, jint id) { - PWMJNI_LOG(logDEBUG) << "Calling PWMJNI initializePWMPort"; - PWMJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_PortHandle)id; int32_t status = 0; auto pwm = HAL_InitializePWMPort((HAL_PortHandle)id, &status); - PWMJNI_LOG(logDEBUG) << "Status = " << status; - PWMJNI_LOG(logDEBUG) << "PWM Handle = " << pwm; CheckStatusRange(env, status, 0, HAL_GetNumPWMChannels(), hal::getPortHandleChannel((HAL_PortHandle)id)); return (jint)pwm; @@ -59,8 +45,6 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_PWMJNI_checkPWMChannel (JNIEnv* env, jclass, jint channel) { - PWMJNI_LOG(logDEBUG) << "Calling PWMJNI checkPWMChannel"; - PWMJNI_LOG(logDEBUG) << "Channel = " << channel; return HAL_CheckPWMChannel(channel); } @@ -73,8 +57,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_PWMJNI_freePWMPort (JNIEnv* env, jclass, jint id) { - PWMJNI_LOG(logDEBUG) << "Calling PWMJNI freePWMPort"; - PWMJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_DigitalHandle)id; int32_t status = 0; HAL_FreePWMPort((HAL_DigitalHandle)id, &status); CheckStatus(env, status); @@ -90,8 +72,6 @@ Java_edu_wpi_first_hal_PWMJNI_setPWMConfigRaw (JNIEnv* env, jclass, jint id, jint maxPwm, jint deadbandMaxPwm, jint centerPwm, jint deadbandMinPwm, jint minPwm) { - PWMJNI_LOG(logDEBUG) << "Calling PWMJNI setPWMConfigRaw"; - PWMJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_DigitalHandle)id; int32_t status = 0; HAL_SetPWMConfigRaw((HAL_DigitalHandle)id, maxPwm, deadbandMaxPwm, centerPwm, deadbandMinPwm, minPwm, &status); @@ -108,8 +88,6 @@ Java_edu_wpi_first_hal_PWMJNI_setPWMConfig (JNIEnv* env, jclass, jint id, jdouble maxPwm, jdouble deadbandMaxPwm, jdouble centerPwm, jdouble deadbandMinPwm, jdouble minPwm) { - PWMJNI_LOG(logDEBUG) << "Calling PWMJNI setPWMConfig"; - PWMJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_DigitalHandle)id; int32_t status = 0; HAL_SetPWMConfig((HAL_DigitalHandle)id, maxPwm, deadbandMaxPwm, centerPwm, deadbandMinPwm, minPwm, &status); @@ -125,8 +103,6 @@ JNIEXPORT jobject JNICALL Java_edu_wpi_first_hal_PWMJNI_getPWMConfigRaw (JNIEnv* env, jclass, jint id) { - PWMJNI_LOG(logDEBUG) << "Calling PWMJNI getPWMConfigRaw"; - PWMJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_DigitalHandle)id; int32_t status = 0; int32_t maxPwm = 0; int32_t deadbandMaxPwm = 0; @@ -149,10 +125,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_PWMJNI_setPWMEliminateDeadband (JNIEnv* env, jclass, jint id, jboolean value) { - PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; int32_t status = 0; HAL_SetPWMEliminateDeadband((HAL_DigitalHandle)id, value, &status); - PWMJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -165,10 +139,8 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_PWMJNI_getPWMEliminateDeadband (JNIEnv* env, jclass, jint id) { - PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; int32_t status = 0; auto val = HAL_GetPWMEliminateDeadband((HAL_DigitalHandle)id, &status); - PWMJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); return (jboolean)val; } @@ -182,11 +154,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_PWMJNI_setPWMRaw (JNIEnv* env, jclass, jint id, jshort value) { - PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; - PWMJNI_LOG(logDEBUG) << "PWM Value = " << value; int32_t status = 0; HAL_SetPWMRaw((HAL_DigitalHandle)id, value, &status); - PWMJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -199,11 +168,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_PWMJNI_setPWMSpeed (JNIEnv* env, jclass, jint id, jdouble value) { - PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; - PWMJNI_LOG(logDEBUG) << "PWM Value = " << value; int32_t status = 0; HAL_SetPWMSpeed((HAL_DigitalHandle)id, value, &status); - PWMJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -216,11 +182,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_PWMJNI_setPWMPosition (JNIEnv* env, jclass, jint id, jdouble value) { - PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; - PWMJNI_LOG(logDEBUG) << "PWM Value = " << value; int32_t status = 0; HAL_SetPWMPosition((HAL_DigitalHandle)id, value, &status); - PWMJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -233,11 +196,8 @@ JNIEXPORT jshort JNICALL Java_edu_wpi_first_hal_PWMJNI_getPWMRaw (JNIEnv* env, jclass, jint id) { - PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; int32_t status = 0; jshort returnValue = HAL_GetPWMRaw((HAL_DigitalHandle)id, &status); - PWMJNI_LOG(logDEBUG) << "Status = " << status; - PWMJNI_LOG(logDEBUG) << "Value = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -251,11 +211,8 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_hal_PWMJNI_getPWMSpeed (JNIEnv* env, jclass, jint id) { - PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; int32_t status = 0; jdouble returnValue = HAL_GetPWMSpeed((HAL_DigitalHandle)id, &status); - PWMJNI_LOG(logDEBUG) << "Status = " << status; - PWMJNI_LOG(logDEBUG) << "Value = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -269,11 +226,8 @@ JNIEXPORT jdouble JNICALL Java_edu_wpi_first_hal_PWMJNI_getPWMPosition (JNIEnv* env, jclass, jint id) { - PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; int32_t status = 0; jdouble returnValue = HAL_GetPWMPosition((HAL_DigitalHandle)id, &status); - PWMJNI_LOG(logDEBUG) << "Status = " << status; - PWMJNI_LOG(logDEBUG) << "Value = " << returnValue; CheckStatus(env, status); return returnValue; } @@ -287,10 +241,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_PWMJNI_setPWMDisabled (JNIEnv* env, jclass, jint id) { - PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; int32_t status = 0; HAL_SetPWMDisabled((HAL_DigitalHandle)id, &status); - PWMJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -303,10 +255,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_PWMJNI_latchPWMZero (JNIEnv* env, jclass, jint id) { - PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; int32_t status = 0; HAL_LatchPWMZero((HAL_DigitalHandle)id, &status); - PWMJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -319,11 +269,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_PWMJNI_setPWMPeriodScale (JNIEnv* env, jclass, jint id, jint value) { - PWMJNI_LOG(logDEBUG) << "PWM Handle = " << (HAL_DigitalHandle)id; - PWMJNI_LOG(logDEBUG) << "PeriodScale Value = " << value; int32_t status = 0; HAL_SetPWMPeriodScale((HAL_DigitalHandle)id, value, &status); - PWMJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } diff --git a/hal/src/main/native/cpp/jni/PortsJNI.cpp b/hal/src/main/native/cpp/jni/PortsJNI.cpp index 4e149842d3..1adb7fb5c8 100644 --- a/hal/src/main/native/cpp/jni/PortsJNI.cpp +++ b/hal/src/main/native/cpp/jni/PortsJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -12,19 +12,9 @@ #include "HALUtil.h" #include "edu_wpi_first_hal_PortsJNI.h" #include "hal/Ports.h" -#include "hal/cpp/Log.h" using namespace frc; -// set the logging level -TLogLevel portsJNILogLevel = logWARNING; - -#define PORTSJNI_LOG(level) \ - if (level > portsJNILogLevel) \ - ; \ - else \ - Log().Get(level) - extern "C" { /* * Class: edu_wpi_first_hal_PortsJNI @@ -35,9 +25,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PortsJNI_getNumAccumulators (JNIEnv* env, jclass) { - PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumAccumulators"; jint value = HAL_GetNumAccumulators(); - PORTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } @@ -50,9 +38,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PortsJNI_getNumAnalogTriggers (JNIEnv* env, jclass) { - PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumAnalogTriggers"; jint value = HAL_GetNumAnalogTriggers(); - PORTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } @@ -65,9 +51,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PortsJNI_getNumAnalogInputs (JNIEnv* env, jclass) { - PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumAnalogInputs"; jint value = HAL_GetNumAnalogInputs(); - PORTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } @@ -80,9 +64,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PortsJNI_getNumAnalogOutputs (JNIEnv* env, jclass) { - PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumAnalogOutputs"; jint value = HAL_GetNumAnalogOutputs(); - PORTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } @@ -95,9 +77,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PortsJNI_getNumCounters (JNIEnv* env, jclass) { - PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumCounters"; jint value = HAL_GetNumCounters(); - PORTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } @@ -110,9 +90,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PortsJNI_getNumDigitalHeaders (JNIEnv* env, jclass) { - PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumDigitalHeaders"; jint value = HAL_GetNumDigitalHeaders(); - PORTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } @@ -125,9 +103,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PortsJNI_getNumPWMHeaders (JNIEnv* env, jclass) { - PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumPWMHeaders"; jint value = HAL_GetNumPWMHeaders(); - PORTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } @@ -140,9 +116,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PortsJNI_getNumDigitalChannels (JNIEnv* env, jclass) { - PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumDigitalChannels"; jint value = HAL_GetNumDigitalChannels(); - PORTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } @@ -155,9 +129,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PortsJNI_getNumPWMChannels (JNIEnv* env, jclass) { - PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumPWMChannels"; jint value = HAL_GetNumPWMChannels(); - PORTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } @@ -170,9 +142,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PortsJNI_getNumDigitalPWMOutputs (JNIEnv* env, jclass) { - PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumDigitalPWMOutputs"; jint value = HAL_GetNumDigitalPWMOutputs(); - PORTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } @@ -185,9 +155,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PortsJNI_getNumEncoders (JNIEnv* env, jclass) { - PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumEncoders"; jint value = HAL_GetNumEncoders(); - PORTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } @@ -200,9 +168,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PortsJNI_getNumInterrupts (JNIEnv* env, jclass) { - PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumInterrupts"; jint value = HAL_GetNumInterrupts(); - PORTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } @@ -215,9 +181,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PortsJNI_getNumRelayChannels (JNIEnv* env, jclass) { - PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumRelayChannels"; jint value = HAL_GetNumRelayChannels(); - PORTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } @@ -230,9 +194,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PortsJNI_getNumRelayHeaders (JNIEnv* env, jclass) { - PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumRelayHeaders"; jint value = HAL_GetNumRelayHeaders(); - PORTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } @@ -245,9 +207,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PortsJNI_getNumPCMModules (JNIEnv* env, jclass) { - PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumPCMModules"; jint value = HAL_GetNumPCMModules(); - PORTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } @@ -260,9 +220,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PortsJNI_getNumSolenoidChannels (JNIEnv* env, jclass) { - PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumSolenoidChannels"; jint value = HAL_GetNumSolenoidChannels(); - PORTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } @@ -275,9 +233,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PortsJNI_getNumPDPModules (JNIEnv* env, jclass) { - PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumPDPModules"; jint value = HAL_GetNumPDPModules(); - PORTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } @@ -290,9 +246,7 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_PortsJNI_getNumPDPChannels (JNIEnv* env, jclass) { - PORTSJNI_LOG(logDEBUG) << "Calling PortsJNI getNumPDPChannels"; jint value = HAL_GetNumPDPChannels(); - PORTSJNI_LOG(logDEBUG) << "Value = " << value; return value; } } // extern "C" diff --git a/hal/src/main/native/cpp/jni/RelayJNI.cpp b/hal/src/main/native/cpp/jni/RelayJNI.cpp index 0cc70fbde2..c058435f0a 100644 --- a/hal/src/main/native/cpp/jni/RelayJNI.cpp +++ b/hal/src/main/native/cpp/jni/RelayJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -13,20 +13,10 @@ #include "edu_wpi_first_hal_RelayJNI.h" #include "hal/Ports.h" #include "hal/Relay.h" -#include "hal/cpp/Log.h" #include "hal/handles/HandlesInternal.h" using namespace frc; -// set the logging level -TLogLevel relayJNILogLevel = logWARNING; - -#define RELAYJNI_LOG(level) \ - if (level > relayJNILogLevel) \ - ; \ - else \ - Log().Get(level) - extern "C" { /* @@ -38,14 +28,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_RelayJNI_initializeRelayPort (JNIEnv* env, jclass, jint id, jboolean fwd) { - RELAYJNI_LOG(logDEBUG) << "Calling RELAYJNI initializeRelayPort"; - RELAYJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_PortHandle)id; - RELAYJNI_LOG(logDEBUG) << "Forward = " << (jint)fwd; int32_t status = 0; HAL_RelayHandle handle = HAL_InitializeRelayPort( (HAL_PortHandle)id, static_cast(fwd), &status); - RELAYJNI_LOG(logDEBUG) << "Status = " << status; - RELAYJNI_LOG(logDEBUG) << "Relay Handle = " << handle; CheckStatusRange(env, status, 0, HAL_GetNumRelayChannels(), hal::getPortHandleChannel((HAL_PortHandle)id)); return (jint)handle; @@ -60,8 +45,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_RelayJNI_freeRelayPort (JNIEnv* env, jclass, jint id) { - RELAYJNI_LOG(logDEBUG) << "Calling RELAYJNI freeRelayPort"; - RELAYJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_RelayHandle)id; HAL_FreeRelayPort((HAL_RelayHandle)id); } @@ -74,8 +57,6 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_RelayJNI_checkRelayChannel (JNIEnv* env, jclass, jint channel) { - RELAYJNI_LOG(logDEBUG) << "Calling RELAYJNI checkRelayChannel"; - RELAYJNI_LOG(logDEBUG) << "Channel = " << channel; return (jboolean)HAL_CheckRelayChannel(static_cast(channel)); } @@ -88,12 +69,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_RelayJNI_setRelay (JNIEnv* env, jclass, jint id, jboolean value) { - RELAYJNI_LOG(logDEBUG) << "Calling RELAYJNI setRelay"; - RELAYJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_RelayHandle)id; - RELAYJNI_LOG(logDEBUG) << "Flag = " << (jint)value; int32_t status = 0; HAL_SetRelay((HAL_RelayHandle)id, value, &status); - RELAYJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -106,12 +83,8 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_RelayJNI_getRelay (JNIEnv* env, jclass, jint id) { - RELAYJNI_LOG(logDEBUG) << "Calling RELAYJNI getRelay"; - RELAYJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_RelayHandle)id; int32_t status = 0; jboolean returnValue = HAL_GetRelay((HAL_RelayHandle)id, &status); - RELAYJNI_LOG(logDEBUG) << "Status = " << status; - RELAYJNI_LOG(logDEBUG) << "getRelayResult = " << (jint)returnValue; CheckStatus(env, status); return returnValue; } diff --git a/hal/src/main/native/cpp/jni/SPIJNI.cpp b/hal/src/main/native/cpp/jni/SPIJNI.cpp index d5940584ec..27078fd855 100644 --- a/hal/src/main/native/cpp/jni/SPIJNI.cpp +++ b/hal/src/main/native/cpp/jni/SPIJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -14,20 +14,10 @@ #include "HALUtil.h" #include "edu_wpi_first_hal_SPIJNI.h" #include "hal/SPI.h" -#include "hal/cpp/Log.h" using namespace frc; using namespace wpi::java; -// set the logging level -TLogLevel spiJNILogLevel = logWARNING; - -#define SPIJNI_LOG(level) \ - if (level > spiJNILogLevel) \ - ; \ - else \ - Log().Get(level) - extern "C" { /* @@ -39,11 +29,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SPIJNI_spiInitialize (JNIEnv* env, jclass, jint port) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiInitialize"; - SPIJNI_LOG(logDEBUG) << "Port = " << (jint)port; int32_t status = 0; HAL_InitializeSPI(static_cast(port), &status); - SPIJNI_LOG(logDEBUG) << "Status = " << status; CheckStatusForceThrow(env, status); } @@ -57,8 +44,6 @@ Java_edu_wpi_first_hal_SPIJNI_spiTransaction (JNIEnv* env, jclass, jint port, jobject dataToSend, jobject dataReceived, jbyte size) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiTransaction"; - SPIJNI_LOG(logDEBUG) << "Port = " << (jint)port; uint8_t* dataToSendPtr = nullptr; if (dataToSend != 0) { dataToSendPtr = @@ -66,12 +51,8 @@ Java_edu_wpi_first_hal_SPIJNI_spiTransaction } uint8_t* dataReceivedPtr = reinterpret_cast(env->GetDirectBufferAddress(dataReceived)); - SPIJNI_LOG(logDEBUG) << "Size = " << (jint)size; - SPIJNI_LOG(logDEBUG) << "DataToSendPtr = " << dataToSendPtr; - SPIJNI_LOG(logDEBUG) << "DataReceivedPtr = " << dataReceivedPtr; jint retVal = HAL_TransactionSPI(static_cast(port), dataToSendPtr, dataReceivedPtr, size); - SPIJNI_LOG(logDEBUG) << "ReturnValue = " << (jint)retVal; return retVal; } @@ -85,9 +66,6 @@ Java_edu_wpi_first_hal_SPIJNI_spiTransactionB (JNIEnv* env, jclass, jint port, jbyteArray dataToSend, jbyteArray dataReceived, jbyte size) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiTransactionB"; - SPIJNI_LOG(logDEBUG) << "Port = " << (jint)port; - SPIJNI_LOG(logDEBUG) << "Size = " << (jint)size; wpi::SmallVector recvBuf; recvBuf.resize(size); jint retVal = @@ -97,7 +75,6 @@ Java_edu_wpi_first_hal_SPIJNI_spiTransactionB recvBuf.data(), size); env->SetByteArrayRegion(dataReceived, 0, size, reinterpret_cast(recvBuf.data())); - SPIJNI_LOG(logDEBUG) << "ReturnValue = " << (jint)retVal; return retVal; } @@ -110,18 +87,13 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_SPIJNI_spiWrite (JNIEnv* env, jclass, jint port, jobject dataToSend, jbyte size) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiWrite"; - SPIJNI_LOG(logDEBUG) << "Port = " << (jint)port; uint8_t* dataToSendPtr = nullptr; if (dataToSend != 0) { dataToSendPtr = reinterpret_cast(env->GetDirectBufferAddress(dataToSend)); } - SPIJNI_LOG(logDEBUG) << "Size = " << (jint)size; - SPIJNI_LOG(logDEBUG) << "DataToSendPtr = " << dataToSendPtr; jint retVal = HAL_WriteSPI(static_cast(port), dataToSendPtr, size); - SPIJNI_LOG(logDEBUG) << "ReturnValue = " << (jint)retVal; return retVal; } @@ -134,14 +106,10 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_SPIJNI_spiWriteB (JNIEnv* env, jclass, jint port, jbyteArray dataToSend, jbyte size) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiWriteB"; - SPIJNI_LOG(logDEBUG) << "Port = " << (jint)port; - SPIJNI_LOG(logDEBUG) << "Size = " << (jint)size; jint retVal = HAL_WriteSPI(static_cast(port), reinterpret_cast( JByteArrayRef(env, dataToSend).array().data()), size); - SPIJNI_LOG(logDEBUG) << "ReturnValue = " << (jint)retVal; return retVal; } @@ -155,13 +123,8 @@ Java_edu_wpi_first_hal_SPIJNI_spiRead (JNIEnv* env, jclass, jint port, jboolean initiate, jobject dataReceived, jbyte size) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiRead"; - SPIJNI_LOG(logDEBUG) << "Port = " << (jint)port; - SPIJNI_LOG(logDEBUG) << "Initiate = " << (jboolean)initiate; uint8_t* dataReceivedPtr = reinterpret_cast(env->GetDirectBufferAddress(dataReceived)); - SPIJNI_LOG(logDEBUG) << "Size = " << (jint)size; - SPIJNI_LOG(logDEBUG) << "DataReceivedPtr = " << dataReceivedPtr; jint retVal; if (initiate) { wpi::SmallVector sendBuf; @@ -172,7 +135,6 @@ Java_edu_wpi_first_hal_SPIJNI_spiRead retVal = HAL_ReadSPI(static_cast(port), reinterpret_cast(dataReceivedPtr), size); } - SPIJNI_LOG(logDEBUG) << "ReturnValue = " << (jint)retVal; return retVal; } @@ -186,10 +148,6 @@ Java_edu_wpi_first_hal_SPIJNI_spiReadB (JNIEnv* env, jclass, jint port, jboolean initiate, jbyteArray dataReceived, jbyte size) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiReadB"; - SPIJNI_LOG(logDEBUG) << "Port = " << (jint)port; - SPIJNI_LOG(logDEBUG) << "Initiate = " << (jboolean)initiate; - SPIJNI_LOG(logDEBUG) << "Size = " << (jint)size; jint retVal; wpi::SmallVector recvBuf; recvBuf.resize(size); @@ -203,7 +161,6 @@ Java_edu_wpi_first_hal_SPIJNI_spiReadB } env->SetByteArrayRegion(dataReceived, 0, size, reinterpret_cast(recvBuf.data())); - SPIJNI_LOG(logDEBUG) << "ReturnValue = " << (jint)retVal; return retVal; } @@ -216,8 +173,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SPIJNI_spiClose (JNIEnv*, jclass, jint port) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiClose"; - SPIJNI_LOG(logDEBUG) << "Port = " << (jint)port; HAL_CloseSPI(static_cast(port)); } @@ -230,9 +185,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SPIJNI_spiSetSpeed (JNIEnv*, jclass, jint port, jint speed) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiSetSpeed"; - SPIJNI_LOG(logDEBUG) << "Port = " << (jint)port; - SPIJNI_LOG(logDEBUG) << "Speed = " << (jint)speed; HAL_SetSPISpeed(static_cast(port), speed); } @@ -246,11 +198,6 @@ Java_edu_wpi_first_hal_SPIJNI_spiSetOpts (JNIEnv*, jclass, jint port, jint msb_first, jint sample_on_trailing, jint clk_idle_high) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiSetOpts"; - SPIJNI_LOG(logDEBUG) << "Port = " << (jint)port; - SPIJNI_LOG(logDEBUG) << "msb_first = " << msb_first; - SPIJNI_LOG(logDEBUG) << "sample_on_trailing = " << sample_on_trailing; - SPIJNI_LOG(logDEBUG) << "clk_idle_high = " << clk_idle_high; HAL_SetSPIOpts(static_cast(port), msb_first, sample_on_trailing, clk_idle_high); } @@ -264,11 +211,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SPIJNI_spiSetChipSelectActiveHigh (JNIEnv* env, jclass, jint port) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiSetCSActiveHigh"; - SPIJNI_LOG(logDEBUG) << "Port = " << (jint)port; int32_t status = 0; HAL_SetSPIChipSelectActiveHigh(static_cast(port), &status); - SPIJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -281,11 +225,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SPIJNI_spiSetChipSelectActiveLow (JNIEnv* env, jclass, jint port) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiSetCSActiveLow"; - SPIJNI_LOG(logDEBUG) << "Port = " << (jint)port; int32_t status = 0; HAL_SetSPIChipSelectActiveLow(static_cast(port), &status); - SPIJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -298,12 +239,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SPIJNI_spiInitAuto (JNIEnv* env, jclass, jint port, jint bufferSize) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiInitAuto"; - SPIJNI_LOG(logDEBUG) << "Port = " << port; - SPIJNI_LOG(logDEBUG) << "BufferSize = " << bufferSize; int32_t status = 0; HAL_InitSPIAuto(static_cast(port), bufferSize, &status); - SPIJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -316,11 +253,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SPIJNI_spiFreeAuto (JNIEnv* env, jclass, jint port) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiFreeAuto"; - SPIJNI_LOG(logDEBUG) << "Port = " << port; int32_t status = 0; HAL_FreeSPIAuto(static_cast(port), &status); - SPIJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -333,12 +267,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SPIJNI_spiStartAutoRate (JNIEnv* env, jclass, jint port, jdouble period) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiStartAutoRate"; - SPIJNI_LOG(logDEBUG) << "Port = " << port; - SPIJNI_LOG(logDEBUG) << "Period = " << period; int32_t status = 0; HAL_StartSPIAutoRate(static_cast(port), period, &status); - SPIJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -352,17 +282,10 @@ Java_edu_wpi_first_hal_SPIJNI_spiStartAutoTrigger (JNIEnv* env, jclass, jint port, jint digitalSourceHandle, jint analogTriggerType, jboolean triggerRising, jboolean triggerFalling) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiStartAutoTrigger"; - SPIJNI_LOG(logDEBUG) << "Port = " << port; - SPIJNI_LOG(logDEBUG) << "DigitalSourceHandle = " << digitalSourceHandle; - SPIJNI_LOG(logDEBUG) << "AnalogTriggerType = " << analogTriggerType; - SPIJNI_LOG(logDEBUG) << "TriggerRising = " << (jint)triggerRising; - SPIJNI_LOG(logDEBUG) << "TriggerFalling = " << (jint)triggerFalling; int32_t status = 0; HAL_StartSPIAutoTrigger(static_cast(port), digitalSourceHandle, static_cast(analogTriggerType), triggerRising, triggerFalling, &status); - SPIJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -375,11 +298,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SPIJNI_spiStopAuto (JNIEnv* env, jclass, jint port) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiStopAuto"; - SPIJNI_LOG(logDEBUG) << "Port = " << port; int32_t status = 0; HAL_StopSPIAuto(static_cast(port), &status); - SPIJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -392,16 +312,12 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SPIJNI_spiSetAutoTransmitData (JNIEnv* env, jclass, jint port, jbyteArray dataToSend, jint zeroSize) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiSetAutoTransmitData"; - SPIJNI_LOG(logDEBUG) << "Port = " << port; - SPIJNI_LOG(logDEBUG) << "ZeroSize = " << zeroSize; JByteArrayRef jarr(env, dataToSend); int32_t status = 0; HAL_SetSPIAutoTransmitData( static_cast(port), reinterpret_cast(jarr.array().data()), jarr.array().size(), zeroSize, &status); - SPIJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -414,11 +330,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SPIJNI_spiForceAutoRead (JNIEnv* env, jclass, jint port) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiForceAutoRead"; - SPIJNI_LOG(logDEBUG) << "Port = " << port; int32_t status = 0; HAL_ForceSPIAutoRead(static_cast(port), &status); - SPIJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -432,17 +345,11 @@ Java_edu_wpi_first_hal_SPIJNI_spiReadAutoReceivedData__ILjava_nio_ByteBuffer_2ID (JNIEnv* env, jclass, jint port, jobject buffer, jint numToRead, jdouble timeout) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiReadAutoReceivedData"; - SPIJNI_LOG(logDEBUG) << "Port = " << port; - SPIJNI_LOG(logDEBUG) << "NumToRead = " << numToRead; - SPIJNI_LOG(logDEBUG) << "Timeout = " << timeout; uint32_t* recvBuf = reinterpret_cast(env->GetDirectBufferAddress(buffer)); int32_t status = 0; jint retval = HAL_ReadSPIAutoReceivedData( static_cast(port), recvBuf, numToRead, timeout, &status); - SPIJNI_LOG(logDEBUG) << "Status = " << status; - SPIJNI_LOG(logDEBUG) << "Return = " << retval; CheckStatus(env, status); return retval; } @@ -457,18 +364,12 @@ Java_edu_wpi_first_hal_SPIJNI_spiReadAutoReceivedData__I_3IID (JNIEnv* env, jclass, jint port, jintArray buffer, jint numToRead, jdouble timeout) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiReadAutoReceivedData"; - SPIJNI_LOG(logDEBUG) << "Port = " << port; - SPIJNI_LOG(logDEBUG) << "NumToRead = " << numToRead; - SPIJNI_LOG(logDEBUG) << "Timeout = " << timeout; wpi::SmallVector recvBuf; recvBuf.resize(numToRead); int32_t status = 0; jint retval = HAL_ReadSPIAutoReceivedData(static_cast(port), recvBuf.data(), numToRead, timeout, &status); - SPIJNI_LOG(logDEBUG) << "Status = " << status; - SPIJNI_LOG(logDEBUG) << "Return = " << retval; if (!CheckStatus(env, status)) return retval; if (numToRead > 0) { env->SetIntArrayRegion(buffer, 0, numToRead, @@ -486,13 +387,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_SPIJNI_spiGetAutoDroppedCount (JNIEnv* env, jclass, jint port) { - SPIJNI_LOG(logDEBUG) << "Calling SPIJNI spiGetAutoDroppedCount"; - SPIJNI_LOG(logDEBUG) << "Port = " << port; int32_t status = 0; auto retval = HAL_GetSPIAutoDroppedCount(static_cast(port), &status); - SPIJNI_LOG(logDEBUG) << "Status = " << status; - SPIJNI_LOG(logDEBUG) << "Return = " << retval; CheckStatus(env, status); return retval; } diff --git a/hal/src/main/native/cpp/jni/SerialPortJNI.cpp b/hal/src/main/native/cpp/jni/SerialPortJNI.cpp index 4524fe6143..d127e740a0 100644 --- a/hal/src/main/native/cpp/jni/SerialPortJNI.cpp +++ b/hal/src/main/native/cpp/jni/SerialPortJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -14,20 +14,10 @@ #include "HALUtil.h" #include "edu_wpi_first_hal_SerialPortJNI.h" #include "hal/SerialPort.h" -#include "hal/cpp/Log.h" using namespace frc; using namespace wpi::java; -// set the logging level -TLogLevel serialJNILogLevel = logWARNING; - -#define SERIALJNI_LOG(level) \ - if (level > serialJNILogLevel) \ - ; \ - else \ - Log().Get(level) - extern "C" { /* @@ -39,11 +29,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialInitializePort (JNIEnv* env, jclass, jbyte port) { - SERIALJNI_LOG(logDEBUG) << "Calling Serial Initialize"; - SERIALJNI_LOG(logDEBUG) << "Port = " << (jint)port; int32_t status = 0; HAL_InitializeSerialPort(static_cast(port), &status); - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatusForceThrow(env, status); } @@ -56,14 +43,10 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialInitializePortDirect (JNIEnv* env, jclass, jbyte port, jstring portName) { - SERIALJNI_LOG(logDEBUG) << "Calling Serial Initialize Direct"; - SERIALJNI_LOG(logDEBUG) << "Port = " << (jint)port; JStringRef portNameRef{env, portName}; - SERIALJNI_LOG(logDEBUG) << "PortName = " << portNameRef.c_str(); int32_t status = 0; HAL_InitializeSerialPortDirect(static_cast(port), portNameRef.c_str(), &status); - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatusForceThrow(env, status); } @@ -76,11 +59,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialSetBaudRate (JNIEnv* env, jclass, jbyte port, jint rate) { - SERIALJNI_LOG(logDEBUG) << "Setting Serial Baud Rate"; - SERIALJNI_LOG(logDEBUG) << "Baud: " << rate; int32_t status = 0; HAL_SetSerialBaudRate(static_cast(port), rate, &status); - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -93,11 +73,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialSetDataBits (JNIEnv* env, jclass, jbyte port, jbyte bits) { - SERIALJNI_LOG(logDEBUG) << "Setting Serial Data Bits"; - SERIALJNI_LOG(logDEBUG) << "Data Bits: " << bits; int32_t status = 0; HAL_SetSerialDataBits(static_cast(port), bits, &status); - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -110,11 +87,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialSetParity (JNIEnv* env, jclass, jbyte port, jbyte parity) { - SERIALJNI_LOG(logDEBUG) << "Setting Serial Parity"; - SERIALJNI_LOG(logDEBUG) << "Parity: " << parity; int32_t status = 0; HAL_SetSerialParity(static_cast(port), parity, &status); - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -127,11 +101,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialSetStopBits (JNIEnv* env, jclass, jbyte port, jbyte bits) { - SERIALJNI_LOG(logDEBUG) << "Setting Serial Stop Bits"; - SERIALJNI_LOG(logDEBUG) << "Stop Bits: " << bits; int32_t status = 0; HAL_SetSerialStopBits(static_cast(port), bits, &status); - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -144,11 +115,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialSetWriteMode (JNIEnv* env, jclass, jbyte port, jbyte mode) { - SERIALJNI_LOG(logDEBUG) << "Setting Serial Write Mode"; - SERIALJNI_LOG(logDEBUG) << "Write mode: " << mode; int32_t status = 0; HAL_SetSerialWriteMode(static_cast(port), mode, &status); - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -161,11 +129,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialSetFlowControl (JNIEnv* env, jclass, jbyte port, jbyte flow) { - SERIALJNI_LOG(logDEBUG) << "Setting Serial Flow Control"; - SERIALJNI_LOG(logDEBUG) << "Flow Control: " << flow; int32_t status = 0; HAL_SetSerialFlowControl(static_cast(port), flow, &status); - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -178,11 +143,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialSetTimeout (JNIEnv* env, jclass, jbyte port, jdouble timeout) { - SERIALJNI_LOG(logDEBUG) << "Setting Serial Timeout"; - SERIALJNI_LOG(logDEBUG) << "Timeout: " << timeout; int32_t status = 0; HAL_SetSerialTimeout(static_cast(port), timeout, &status); - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -195,12 +157,9 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialEnableTermination (JNIEnv* env, jclass, jbyte port, jchar terminator) { - SERIALJNI_LOG(logDEBUG) << "Setting Serial Enable Termination"; - SERIALJNI_LOG(logDEBUG) << "Terminator: " << terminator; int32_t status = 0; HAL_EnableSerialTermination(static_cast(port), terminator, &status); - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -213,10 +172,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialDisableTermination (JNIEnv* env, jclass, jbyte port) { - SERIALJNI_LOG(logDEBUG) << "Setting Serial Disable termination"; int32_t status = 0; HAL_DisableSerialTermination(static_cast(port), &status); - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -229,11 +186,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialSetReadBufferSize (JNIEnv* env, jclass, jbyte port, jint size) { - SERIALJNI_LOG(logDEBUG) << "Setting Serial Read Buffer Size"; - SERIALJNI_LOG(logDEBUG) << "Size: " << size; int32_t status = 0; HAL_SetSerialReadBufferSize(static_cast(port), size, &status); - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -246,12 +200,9 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialSetWriteBufferSize (JNIEnv* env, jclass, jbyte port, jint size) { - SERIALJNI_LOG(logDEBUG) << "Setting Serial Write Buffer Size"; - SERIALJNI_LOG(logDEBUG) << "Size: " << size; int32_t status = 0; HAL_SetSerialWriteBufferSize(static_cast(port), size, &status); - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -264,11 +215,9 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialGetBytesReceived (JNIEnv* env, jclass, jbyte port) { - SERIALJNI_LOG(logDEBUG) << "Serial Get Bytes Received"; int32_t status = 0; jint retVal = HAL_GetSerialBytesReceived(static_cast(port), &status); - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); return retVal; } @@ -282,7 +231,6 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialRead (JNIEnv* env, jclass, jbyte port, jbyteArray dataReceived, jint size) { - SERIALJNI_LOG(logDEBUG) << "Serial Read"; wpi::SmallVector recvBuf; recvBuf.resize(size); int32_t status = 0; @@ -290,8 +238,6 @@ Java_edu_wpi_first_hal_SerialPortJNI_serialRead recvBuf.data(), size, &status); env->SetByteArrayRegion(dataReceived, 0, size, reinterpret_cast(recvBuf.data())); - SERIALJNI_LOG(logDEBUG) << "ReturnValue = " << retVal; - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); return retVal; } @@ -305,15 +251,12 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialWrite (JNIEnv* env, jclass, jbyte port, jbyteArray dataToSend, jint size) { - SERIALJNI_LOG(logDEBUG) << "Serial Write"; int32_t status = 0; jint retVal = HAL_WriteSerial(static_cast(port), reinterpret_cast( JByteArrayRef(env, dataToSend).array().data()), size, &status); - SERIALJNI_LOG(logDEBUG) << "ReturnValue = " << retVal; - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); return retVal; } @@ -327,10 +270,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialFlush (JNIEnv* env, jclass, jbyte port) { - SERIALJNI_LOG(logDEBUG) << "Serial Flush"; int32_t status = 0; HAL_FlushSerial(static_cast(port), &status); - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -343,10 +284,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialClear (JNIEnv* env, jclass, jbyte port) { - SERIALJNI_LOG(logDEBUG) << "Serial Clear"; int32_t status = 0; HAL_ClearSerial(static_cast(port), &status); - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } @@ -359,10 +298,8 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SerialPortJNI_serialClose (JNIEnv* env, jclass, jbyte port) { - SERIALJNI_LOG(logDEBUG) << "Serial Close"; int32_t status = 0; HAL_CloseSerial(static_cast(port), &status); - SERIALJNI_LOG(logDEBUG) << "Status = " << status; CheckStatus(env, status); } diff --git a/hal/src/main/native/cpp/jni/SolenoidJNI.cpp b/hal/src/main/native/cpp/jni/SolenoidJNI.cpp index 524b70ed9b..4e6f139233 100644 --- a/hal/src/main/native/cpp/jni/SolenoidJNI.cpp +++ b/hal/src/main/native/cpp/jni/SolenoidJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -11,19 +11,10 @@ #include "edu_wpi_first_hal_SolenoidJNI.h" #include "hal/Ports.h" #include "hal/Solenoid.h" -#include "hal/cpp/Log.h" #include "hal/handles/HandlesInternal.h" using namespace frc; -TLogLevel solenoidJNILogLevel = logERROR; - -#define SOLENOIDJNI_LOG(level) \ - if (level > solenoidJNILogLevel) \ - ; \ - else \ - Log().Get(level) - extern "C" { /* @@ -35,17 +26,10 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_SolenoidJNI_initializeSolenoidPort (JNIEnv* env, jclass, jint id) { - SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI initializeSolenoidPort"; - - SOLENOIDJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_PortHandle)id; - int32_t status = 0; HAL_SolenoidHandle handle = HAL_InitializeSolenoidPort((HAL_PortHandle)id, &status); - SOLENOIDJNI_LOG(logDEBUG) << "Status = " << status; - SOLENOIDJNI_LOG(logDEBUG) << "Solenoid Port Handle = " << handle; - // Use solenoid channels, as we have to pick one. CheckStatusRange(env, status, 0, HAL_GetNumSolenoidChannels(), hal::getPortHandleChannel((HAL_PortHandle)id)); @@ -61,8 +45,6 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_SolenoidJNI_checkSolenoidChannel (JNIEnv* env, jclass, jint channel) { - SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI checkSolenoidChannel"; - SOLENOIDJNI_LOG(logDEBUG) << "Channel = " << channel; return HAL_CheckSolenoidChannel(channel); } @@ -75,8 +57,6 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_SolenoidJNI_checkSolenoidModule (JNIEnv* env, jclass, jint module) { - SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI checkSolenoidModule"; - SOLENOIDJNI_LOG(logDEBUG) << "Module = " << module; return HAL_CheckSolenoidModule(module); } @@ -89,9 +69,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SolenoidJNI_freeSolenoidPort (JNIEnv* env, jclass, jint id) { - SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI initializeSolenoidPort"; - - SOLENOIDJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_SolenoidHandle)id; HAL_FreeSolenoidPort((HAL_SolenoidHandle)id); } @@ -104,11 +81,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SolenoidJNI_setSolenoid (JNIEnv* env, jclass, jint solenoid_port, jboolean value) { - SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI SetSolenoid"; - - SOLENOIDJNI_LOG(logDEBUG) - << "Solenoid Port Handle = " << (HAL_SolenoidHandle)solenoid_port; - int32_t status = 0; HAL_SetSolenoid((HAL_SolenoidHandle)solenoid_port, value, &status); CheckStatus(env, status); @@ -209,12 +181,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SolenoidJNI_setOneShotDuration (JNIEnv* env, jclass, jint solenoid_port, jlong durationMS) { - SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI SetOneShotDuration"; - - SOLENOIDJNI_LOG(logDEBUG) - << "Solenoid Port Handle = " << (HAL_SolenoidHandle)solenoid_port; - SOLENOIDJNI_LOG(logDEBUG) << "Duration (MS) = " << durationMS; - int32_t status = 0; HAL_SetOneShotDuration((HAL_SolenoidHandle)solenoid_port, durationMS, &status); @@ -230,11 +196,6 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_hal_SolenoidJNI_fireOneShot (JNIEnv* env, jclass, jint solenoid_port) { - SOLENOIDJNI_LOG(logDEBUG) << "Calling SolenoidJNI fireOneShot"; - - SOLENOIDJNI_LOG(logDEBUG) - << "Solenoid Port Handle = " << (HAL_SolenoidHandle)solenoid_port; - int32_t status = 0; HAL_FireOneShot((HAL_SolenoidHandle)solenoid_port, &status); CheckStatus(env, status); diff --git a/hal/src/main/native/cpp/jni/ThreadsJNI.cpp b/hal/src/main/native/cpp/jni/ThreadsJNI.cpp index ea3cac68b8..d4620e2224 100644 --- a/hal/src/main/native/cpp/jni/ThreadsJNI.cpp +++ b/hal/src/main/native/cpp/jni/ThreadsJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2016-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -12,19 +12,9 @@ #include "HALUtil.h" #include "edu_wpi_first_hal_ThreadsJNI.h" #include "hal/Threads.h" -#include "hal/cpp/Log.h" using namespace frc; -// set the logging level -TLogLevel threadsJNILogLevel = logWARNING; - -#define THREADSJNI_LOG(level) \ - if (level > threadsJNILogLevel) \ - ; \ - else \ - Log().Get(level) - extern "C" { /* * Class: edu_wpi_first_hal_ThreadsJNI @@ -35,7 +25,6 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_hal_ThreadsJNI_getCurrentThreadPriority (JNIEnv* env, jclass) { - THREADSJNI_LOG(logDEBUG) << "Callling GetCurrentThreadPriority"; int32_t status = 0; HAL_Bool isRT = false; auto ret = HAL_GetCurrentThreadPriority(&isRT, &status); @@ -52,7 +41,6 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_ThreadsJNI_getCurrentThreadIsRealTime (JNIEnv* env, jclass) { - THREADSJNI_LOG(logDEBUG) << "Callling GetCurrentThreadIsRealTime"; int32_t status = 0; HAL_Bool isRT = false; HAL_GetCurrentThreadPriority(&isRT, &status); @@ -69,7 +57,6 @@ JNIEXPORT jboolean JNICALL Java_edu_wpi_first_hal_ThreadsJNI_setCurrentThreadPriority (JNIEnv* env, jclass, jboolean realTime, jint priority) { - THREADSJNI_LOG(logDEBUG) << "Callling SetCurrentThreadPriority"; int32_t status = 0; auto ret = HAL_SetCurrentThreadPriority( (HAL_Bool)realTime, static_cast(priority), &status); diff --git a/hal/src/main/native/include/hal/cpp/Log.h b/hal/src/main/native/include/hal/cpp/Log.h deleted file mode 100644 index bcc3995523..0000000000 --- a/hal/src/main/native/include/hal/cpp/Log.h +++ /dev/null @@ -1,128 +0,0 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2016-2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ - -#pragma once - -#include -#include - -#include -#include - -inline std::string NowTime(); - -enum TLogLevel { - logNONE, - logERROR, - logWARNING, - logINFO, - logDEBUG, - logDEBUG1, - logDEBUG2, - logDEBUG3, - logDEBUG4 -}; - -class Log { - public: - Log(); - virtual ~Log(); - wpi::raw_ostream& Get(TLogLevel level = logINFO); - - public: - static TLogLevel& ReportingLevel(); - static std::string ToString(TLogLevel level); - static TLogLevel FromString(const std::string& level); - - protected: - wpi::SmallString<128> buf; - wpi::raw_svector_ostream oss{buf}; - - private: - Log(const Log&); - Log& operator=(const Log&); -}; - -inline Log::Log() {} - -inline wpi::raw_ostream& Log::Get(TLogLevel level) { - oss << "- " << NowTime(); - oss << " " << ToString(level) << ": "; - if (level > logDEBUG) { - oss << std::string(level - logDEBUG, '\t'); - } - return oss; -} - -inline Log::~Log() { - oss << "\n"; - wpi::errs() << oss.str(); -} - -inline TLogLevel& Log::ReportingLevel() { - static TLogLevel reportingLevel = logDEBUG4; - return reportingLevel; -} - -inline std::string Log::ToString(TLogLevel level) { - static const char* const buffer[] = {"NONE", "ERROR", "WARNING", - "INFO", "DEBUG", "DEBUG1", - "DEBUG2", "DEBUG3", "DEBUG4"}; - return buffer[level]; -} - -inline TLogLevel Log::FromString(const std::string& level) { - if (level == "DEBUG4") return logDEBUG4; - if (level == "DEBUG3") return logDEBUG3; - if (level == "DEBUG2") return logDEBUG2; - if (level == "DEBUG1") return logDEBUG1; - if (level == "DEBUG") return logDEBUG; - if (level == "INFO") return logINFO; - if (level == "WARNING") return logWARNING; - if (level == "ERROR") return logERROR; - if (level == "NONE") return logNONE; - Log().Get(logWARNING) << "Unknown logging level '" << level - << "'. Using INFO level as default."; - return logINFO; -} - -using FILELog = Log; // NOLINT - -#define FILE_LOG(level) \ - if (level > FILELog::ReportingLevel()) \ - ; \ - else \ - Log().Get(level) - -inline std::string NowTime() { - wpi::SmallString<128> buf; - wpi::raw_svector_ostream oss(buf); - - using std::chrono::duration_cast; - - auto now = std::chrono::system_clock::now().time_since_epoch(); - - // Hours - auto count = duration_cast(now).count() % 24; - if (count < 10) oss << "0"; - oss << count << ":"; - - // Minutes - count = duration_cast(now).count() % 60; - if (count < 10) oss << "0"; - oss << count << ":"; - - // Seconds - count = duration_cast(now).count() % 60; - if (count < 10) oss << "0"; - oss << count << "."; - - // Milliseconds - oss << duration_cast(now).count() % 1000; - - return oss.str(); -} diff --git a/hal/src/main/native/sim/jni/SimulatorJNI.cpp b/hal/src/main/native/sim/jni/SimulatorJNI.cpp index d1e0f7d6bb..32b6110725 100644 --- a/hal/src/main/native/sim/jni/SimulatorJNI.cpp +++ b/hal/src/main/native/sim/jni/SimulatorJNI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -13,7 +13,6 @@ #include "SpiReadAutoReceiveBufferCallbackStore.h" #include "edu_wpi_first_hal_sim_mockdata_SimulatorJNI.h" #include "hal/HAL.h" -#include "hal/cpp/Log.h" #include "hal/handles/HandlesInternal.h" #include "mockdata/MockHooks.h" diff --git a/wpilibc/src/main/native/cpp/DriverStation.cpp b/wpilibc/src/main/native/cpp/DriverStation.cpp index 9584b7ffbb..d268de7ad8 100644 --- a/wpilibc/src/main/native/cpp/DriverStation.cpp +++ b/wpilibc/src/main/native/cpp/DriverStation.cpp @@ -11,7 +11,6 @@ #include #include -#include #include #include #include