Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-22 01:11:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpilib] Revert throw on nonexistent SimDevice name in SimDeviceSim (#5053)

Browse Source 
This breaks current vendor use of SimDeviceSim.

This reverts commit d991f6e435 (#5041).
This commit is contained in:
Peter Johnson
2023-02-05 11:27:55 -08:00
committed by GitHub
parent b879a6f8c6
commit 8230fc631d
2 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wpilibc/src/main/native/cpp/simulation/SimDeviceSim.cpp
View File

@@ -11,37 +11,20 @@
#include <hal/SimDevice.h>
#include <hal/simulation/SimDeviceData.h>
#include "frc/Errors.h"
using namespace frc;
using namespace frc::sim;
SimDeviceSim::SimDeviceSim(const char* name)
: m_handle{HALSIM_GetSimDeviceHandle(name)} {
if (m_handle == 0) {
throw FRC_MakeError(err::InvalidParameter,
"No sim device exists with name '{}'.", name);
}
}
: m_handle{HALSIM_GetSimDeviceHandle(name)} {}
SimDeviceSim::SimDeviceSim(const char* name, int index) {
m_handle =
HALSIM_GetSimDeviceHandle(fmt::format("{}[{}]", name, index).c_str());
if (m_handle == 0) {
throw FRC_MakeError(err::InvalidParameter,
"No sim device exists with name '{}[{}]'.", name,
index);
}
}
SimDeviceSim::SimDeviceSim(const char* name, int index, int channel) {
m_handle = HALSIM_GetSimDeviceHandle(
fmt::format("{}[{},{}]", name, index, channel).c_str());
if (m_handle == 0) {
throw FRC_MakeError(err::InvalidParameter,
"No sim device exists with name '{}[{},{}]'.", name,
index, channel);
}
}
SimDeviceSim::SimDeviceSim(HAL_SimDeviceHandle handle) : m_handle(handle) {}