Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ntcore] Prefix log levels to avoid macro conflicts (#8686)

Browse Source
This commit is contained in:
Peter Johnson
2026-03-16 21:24:23 -06:00
committed by GitHub
parent aad08b9ad1
commit 58e112480a
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ntcore/src/main/java/org/wpilib/networktables/LogMessage.java
View File

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

18
ntcore/src/main/native/include/wpi/nt/NetworkTableInstance.hpp
View File

@@ -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
};
/**

5
ntcore/src/main/python/semiwrap/NetworkTableInstance.yml
View File

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