Remove JNI logging (#1872)

This commit is contained in:
Thad House
2019-09-06 18:42:40 -07:00
committed by Peter Johnson
parent 3e0f7d0995
commit dd928b4cbf
24 changed files with 21 additions and 1261 deletions

View File

@@ -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"