Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-30 02:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[hal,wpilib] Rename DriverStation constants to all caps

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

26
simulation/halsim_ds_socket/src/main/native/cpp/DSCommPacket.cpp
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);

2
simulation/halsim_ds_socket/src/main/native/include/wpi/halsim/ds_socket/DSCommPacket.hpp
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;
};