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

[sim] GUI: Fix buttons starting at 1 instead of 0 (#8987)

Browse Source 
Closes #8986
This commit is contained in:
Thad House
2026-06-17 13:39:14 -07:00
committed by GitHub
parent c35df58a81
commit 0662a78892
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp
View File

@@ -371,7 +371,7 @@ JoystickModel::JoystickModel(int index) : m_index{index} {
static_cast<uint8_t>(64 - std::countl_zero(halButtons.available)); static_cast<uint8_t>(64 - std::countl_zero(halButtons.available));
for (int i = 0; i < buttonCount; ++i) { for (int i = 0; i < buttonCount; ++i) {
buttons[i] = new wpi::glass::BooleanSource( buttons[i] = new wpi::glass::BooleanSource(
fmt::format("Joystick[{}] Button[{}]", index, i + 1)); fmt::format("Joystick[{}] Button[{}]", index, i));
} }
for (int i = buttonCount; i < 64; ++i) { for (int i = buttonCount; i < 64; ++i) {
buttons[i] = nullptr; buttons[i] = nullptr;
@@ -716,7 +716,7 @@ void KeyboardJoystick::SettingsDisplay() {
m_buttonKey.emplace_back(-1); m_buttonKey.emplace_back(-1);
} }
for (int i = 0; i < m_buttonCount; ++i) { for (int i = 0; i < m_buttonCount; ++i) {
wpi::util::format_to_n_c_str(label, sizeof(label), "Button {}", i + 1); wpi::util::format_to_n_c_str(label, sizeof(label), "Button {}", i);
EditKey(label, &m_buttonKey[i]); EditKey(label, &m_buttonKey[i]);
} }