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: Add option to not zero disconnected joysticks (#2876)

Browse Source 
This allows team sim code to set the joystick values and not have them overwritten by the GUI.
This commit is contained in:
Dean Brettle
2020-11-23 19:46:27 -08:00
committed by GitHub
parent 129be23c9e
commit 467258e050
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,6 +103,7 @@ static RobotJoystick gRobotJoysticks[HAL_kMaxJoysticks];
static std::unique_ptr<JoystickSource> gJoystickSources[HAL_kMaxJoysticks];
static bool gDisableDS = false;
static bool gZeroDisconnectedJoysticks = true;
static std::atomic<bool>* gDSSocketConnected = nullptr;
static inline bool IsDSDisabled() {
@@ -229,13 +230,19 @@ static void DriverStationReadLine(ImGuiContext* ctx,
int num;
if (value.getAsInteger(10, num)) return;
gDisableDS = num;
} else if (name == "zeroDisconnectedJoysticks") {
int num;
if (value.getAsInteger(10, num)) return;
gZeroDisconnectedJoysticks = num;
}
}
static void DriverStationWriteAll(ImGuiContext* ctx,
ImGuiSettingsHandler* handler,
ImGuiTextBuffer* out_buf) {
out_buf->appendf("[DriverStation][Main]\ndisable=%d\n\n", gDisableDS ? 1 : 0);
out_buf->appendf(
"[DriverStation][Main]\ndisable=%d\nzeroDisconnectedJoysticks=%d\n\n",
gDisableDS ? 1 : 0, gZeroDisconnectedJoysticks ? 1 : 0);
}
void SystemJoystick::Update(int i) {
@@ -370,6 +377,7 @@ void RobotJoystick::Update() {
}
void RobotJoystick::SetHAL(int i) {
if (!gZeroDisconnectedJoysticks && (!sys || !sys->present)) return;
// set at HAL level
HALSIM_SetJoystickDescriptor(i, &desc);
HALSIM_SetJoystickAxes(i, &axes);
@@ -675,6 +683,8 @@ static void DriverStationOptionMenu() {
ImGui::MenuItem("Turn off DS (real DS connected)", nullptr, true, false);
} else {
ImGui::MenuItem("Turn off DS", nullptr, &gDisableDS);
ImGui::MenuItem("Zero disconnected joysticks", nullptr,
&gZeroDisconnectedJoysticks, true);
}
}