[hal,wpilib] Rename DriverStation constants to all caps

This commit is contained in:
Peter Johnson
2026-03-13 01:04:29 -07:00
parent 614eb1db18
commit 227f01f3bd
51 changed files with 555 additions and 550 deletions

View File

@@ -18,24 +18,24 @@ using namespace halsim;
HAL_JoystickPOV DegreesToPOV(int degrees) {
switch (degrees) {
case 0:
return HAL_JoystickPOV_kUp;
return HAL_JOYSTICK_POV_UP;
case 45:
return HAL_JoystickPOV_kRightUp;
return HAL_JOYSTICK_POV_RIGHT_UP;
case 90:
return HAL_JoystickPOV_kRight;
return HAL_JOYSTICK_POV_RIGHT;
case 135:
return HAL_JoystickPOV_kRightDown;
return HAL_JOYSTICK_POV_RIGHT_DOWN;
case 180:
return HAL_JoystickPOV_kDown;
return HAL_JOYSTICK_POV_DOWN;
case 225:
return HAL_JoystickPOV_kLeftDown;
return HAL_JOYSTICK_POV_LEFT_DOWN;
case 270:
return HAL_JoystickPOV_kLeft;
return HAL_JOYSTICK_POV_LEFT;
case 315:
return HAL_JoystickPOV_kLeftUp;
return HAL_JOYSTICK_POV_LEFT_UP;
case -1:
default:
return HAL_JoystickPOV_kCentered;
return HAL_JOYSTICK_POV_CENTERED;
}
}
@@ -54,11 +54,11 @@ DSCommPacket::DSCommPacket() {
void DSCommPacket::SetControl(uint8_t control, uint8_t request) {
HAL_RobotMode robotMode;
if ((control & kAutonomous) != 0) {
robotMode = HAL_ROBOTMODE_AUTONOMOUS;
robotMode = HAL_ROBOT_MODE_AUTONOMOUS;
} else if ((control & kTest) != 0) {
robotMode = HAL_ROBOTMODE_TEST;
robotMode = HAL_ROBOT_MODE_TEST;
} else {
robotMode = HAL_ROBOTMODE_TELEOPERATED;
robotMode = HAL_ROBOT_MODE_TELEOPERATED;
}
m_control_word = HAL_MakeControlWord(
wpi::hal::GetDashboardSelectedOpMode(robotMode), robotMode,
@@ -256,7 +256,7 @@ void DSCommPacket::ReadJoystickDescriptionTag(std::span<const uint8_t> data) {
}
void DSCommPacket::SendJoysticks(void) {
for (int i = 0; i < HAL_kMaxJoysticks; i++) {
for (int i = 0; i < HAL_MAX_JOYSTICKS; i++) {
DSCommJoystickPacket& packet = m_joystick_packets[i];
HALSIM_SetJoystickAxes(i, &packet.axes);
HALSIM_SetJoystickPOVs(i, &packet.povs);

View File

@@ -63,7 +63,7 @@ class DSCommPacket {
HAL_ControlWord m_control_word;
HAL_AllianceStationID m_alliance_station;
HAL_MatchInfo matchInfo;
std::array<DSCommJoystickPacket, HAL_kMaxJoysticks> m_joystick_packets;
std::array<DSCommJoystickPacket, HAL_MAX_JOYSTICKS> m_joystick_packets;
double m_match_time = -1;
};

View File

@@ -34,7 +34,7 @@ class DSCommPacketTest : public ::testing::Test {
};
TEST_F(DSCommPacketTest, EmptyJoystickTag) {
for (int i = 0; i < HAL_kMaxJoysticks; i++) {
for (int i = 0; i < HAL_MAX_JOYSTICKS; i++) {
uint8_t arr[2];
auto& data = ReadJoystickTag(arr, 0);
ASSERT_EQ(data.axes.available, 0);
@@ -44,7 +44,7 @@ TEST_F(DSCommPacketTest, EmptyJoystickTag) {
}
TEST_F(DSCommPacketTest, BlankJoystickTag) {
for (int i = 0; i < HAL_kMaxJoysticks; i++) {
for (int i = 0; i < HAL_MAX_JOYSTICKS; i++) {
uint8_t arr[5];
arr[0] = 4;
arr[1] = 2;
@@ -59,7 +59,7 @@ TEST_F(DSCommPacketTest, BlankJoystickTag) {
}
TEST_F(DSCommPacketTest, MainJoystickTag) {
for (int i = 0; i < HAL_kMaxJoysticks; i++) {
for (int i = 0; i < HAL_MAX_JOYSTICKS; i++) {
// Just random data
std::array<uint8_t, 12> _buttons{{0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1}};
@@ -94,7 +94,7 @@ TEST_F(DSCommPacketTest, MainJoystickTag) {
}
TEST_F(DSCommPacketTest, DescriptorTag) {
for (int i = 0; i < HAL_kMaxJoysticks; i++) {
for (int i = 0; i < HAL_MAX_JOYSTICKS; i++) {
uint8_t arr[] = {// Size (2), tag
0, 0, 7,
// Joystick index, Is Xbox, Type
@@ -123,7 +123,7 @@ TEST_F(DSCommPacketTest, MatchInfoTag) {
arr[1] = sizeof(arr) - 2;
auto& matchInfo = ReadNewMatchInfoTag(arr);
ASSERT_STREQ(matchInfo.eventName, "WCBC");
ASSERT_EQ(matchInfo.matchType, HAL_MatchType::HAL_kMatchType_qualification);
ASSERT_EQ(matchInfo.matchType, HAL_MatchType::HAL_MATCH_TYPE_QUALIFICATION);
ASSERT_EQ(matchInfo.matchNumber, 18);
ASSERT_EQ(matchInfo.replayNumber, 1);
}