From 49065aa07f625dba9f57caaa88fb8d4f9835f3f9 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Tue, 17 Mar 2026 16:43:51 -0700 Subject: [PATCH] [wpilib] Rename CAN constants to all caps --- wpilibc/src/main/native/cpp/hardware/bus/CAN.cpp | 2 +- wpilibc/src/main/native/include/wpi/hardware/bus/CAN.hpp | 4 ++-- wpilibc/src/main/python/semiwrap/CAN.yml | 4 ++-- wpilibj/src/main/java/org/wpilib/hardware/bus/CAN.java | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wpilibc/src/main/native/cpp/hardware/bus/CAN.cpp b/wpilibc/src/main/native/cpp/hardware/bus/CAN.cpp index e92d779390..ed82e09247 100644 --- a/wpilibc/src/main/native/cpp/hardware/bus/CAN.cpp +++ b/wpilibc/src/main/native/cpp/hardware/bus/CAN.cpp @@ -13,7 +13,7 @@ using namespace wpi; CAN::CAN(int busId, int deviceId) - : CAN{busId, deviceId, kTeamManufacturer, kTeamDeviceType} {} + : CAN{busId, deviceId, TEAM_MANUFACTURER, TEAM_DEVICE_TYPE} {} CAN::CAN(int busId, int deviceId, int deviceManufacturer, int deviceType) { int32_t status = 0; diff --git a/wpilibc/src/main/native/include/wpi/hardware/bus/CAN.hpp b/wpilibc/src/main/native/include/wpi/hardware/bus/CAN.hpp index 459bd4941f..ea9c6ddb32 100644 --- a/wpilibc/src/main/native/include/wpi/hardware/bus/CAN.hpp +++ b/wpilibc/src/main/native/include/wpi/hardware/bus/CAN.hpp @@ -148,10 +148,10 @@ class CAN { bool ReadPacketTimeout(int apiId, int timeoutMs, HAL_CANReceiveMessage* data); /// Team manufacturer. - static constexpr HAL_CANManufacturer kTeamManufacturer = HAL_CAN_MAN_TEAM_USE; + static constexpr HAL_CANManufacturer TEAM_MANUFACTURER = HAL_CAN_MAN_TEAM_USE; /// Team device type. - static constexpr HAL_CANDeviceType kTeamDeviceType = + static constexpr HAL_CANDeviceType TEAM_DEVICE_TYPE = HAL_CAN_DEV_MISCELLANEOUS; private: diff --git a/wpilibc/src/main/python/semiwrap/CAN.yml b/wpilibc/src/main/python/semiwrap/CAN.yml index d6e25a6b7c..7b9ee8c477 100644 --- a/wpilibc/src/main/python/semiwrap/CAN.yml +++ b/wpilibc/src/main/python/semiwrap/CAN.yml @@ -1,8 +1,8 @@ classes: wpi::CAN: attributes: - kTeamManufacturer: - kTeamDeviceType: + TEAM_MANUFACTURER: + TEAM_DEVICE_TYPE: methods: CAN: overloads: diff --git a/wpilibj/src/main/java/org/wpilib/hardware/bus/CAN.java b/wpilibj/src/main/java/org/wpilib/hardware/bus/CAN.java index bd59345d4d..2351013716 100644 --- a/wpilibj/src/main/java/org/wpilib/hardware/bus/CAN.java +++ b/wpilibj/src/main/java/org/wpilib/hardware/bus/CAN.java @@ -22,10 +22,10 @@ import org.wpilib.hardware.hal.can.CANReceiveMessage; */ public class CAN implements Closeable { /** Team manufacturer. */ - public static final int kTeamManufacturer = CANAPITypes.CANManufacturer.TEAM_USE.id; + public static final int TEAM_MANUFACTURER = CANAPITypes.CANManufacturer.TEAM_USE.id; /** Team device type. */ - public static final int kTeamDeviceType = CANAPITypes.CANDeviceType.MISCELLANEOUS.id; + public static final int TEAM_DEVICE_TYPE = CANAPITypes.CANDeviceType.MISCELLANEOUS.id; private final int m_handle; @@ -37,7 +37,7 @@ public class CAN implements Closeable { * @param deviceId The device id */ public CAN(int busId, int deviceId) { - this(busId, deviceId, kTeamManufacturer, kTeamDeviceType); + this(busId, deviceId, TEAM_MANUFACTURER, TEAM_DEVICE_TYPE); } /**