diff --git a/ntcore/src/main/java/org/wpilib/networktables/LogMessage.java b/ntcore/src/main/java/org/wpilib/networktables/LogMessage.java index 265e9f629a..f35599b699 100644 --- a/ntcore/src/main/java/org/wpilib/networktables/LogMessage.java +++ b/ntcore/src/main/java/org/wpilib/networktables/LogMessage.java @@ -11,7 +11,7 @@ public final class LogMessage { public static final int CRITICAL = 50; /** Error logging level. */ - public static final int ERR = 40; + public static final int ERROR = 40; /** Warning log level. */ public static final int WARNING = 30; diff --git a/ntcore/src/main/native/include/wpi/nt/NetworkTableInstance.hpp b/ntcore/src/main/native/include/wpi/nt/NetworkTableInstance.hpp index aaa8184dd2..f0d178dbf7 100644 --- a/ntcore/src/main/native/include/wpi/nt/NetworkTableInstance.hpp +++ b/ntcore/src/main/native/include/wpi/nt/NetworkTableInstance.hpp @@ -81,15 +81,15 @@ class NetworkTableInstance final { * Logging levels (as used by SetLogger()). */ enum class LogLevel { - CRITICAL = NT_LOG_CRITICAL, - ERR = NT_LOG_ERROR, - WARNING = NT_LOG_WARNING, - INFO = NT_LOG_INFO, - DEBUG = NT_LOG_DEBUG, - DEBUG_1 = NT_LOG_DEBUG1, - DEBUG_2 = NT_LOG_DEBUG2, - DEBUG_3 = NT_LOG_DEBUG3, - DEBUG_4 = NT_LOG_DEBUG4 + LEVEL_CRITICAL = NT_LOG_CRITICAL, + LEVEL_ERROR = NT_LOG_ERROR, + LEVEL_WARNING = NT_LOG_WARNING, + LEVEL_INFO = NT_LOG_INFO, + LEVEL_DEBUG = NT_LOG_DEBUG, + LEVEL_DEBUG_1 = NT_LOG_DEBUG1, + LEVEL_DEBUG_2 = NT_LOG_DEBUG2, + LEVEL_DEBUG_3 = NT_LOG_DEBUG3, + LEVEL_DEBUG_4 = NT_LOG_DEBUG4 }; /** diff --git a/ntcore/src/main/python/semiwrap/NetworkTableInstance.yml b/ntcore/src/main/python/semiwrap/NetworkTableInstance.yml index 328b90de59..58cb73e334 100644 --- a/ntcore/src/main/python/semiwrap/NetworkTableInstance.yml +++ b/ntcore/src/main/python/semiwrap/NetworkTableInstance.yml @@ -31,6 +31,7 @@ classes: inline_code: | .value("kNetModeStarting", (wpi::nt::NetworkTableInstance::NetworkMode)NT_NET_MODE_STARTING) LogLevel: + value_prefix: LEVEL_ methods: NetworkTableInstance: overloads: @@ -160,8 +161,8 @@ classes: NetworkTableInstance::LogLevel minLevel, NetworkTableInstance::LogLevel maxLevel, py::str logName) { py::module::import("ntcore._logutil").attr("_config_logging")(self, minLevel, maxLevel, logName); }, py::kw_only(), - py::arg("min") = NetworkTableInstance::LogLevel::INFO, - py::arg("max") = NetworkTableInstance::LogLevel::CRITICAL, + py::arg("min") = NetworkTableInstance::LogLevel::LEVEL_INFO, + py::arg("max") = NetworkTableInstance::LogLevel::LEVEL_CRITICAL, py::arg("name") = "nt", py::doc("Configure python logging for this instance.\n" "\n"