[wpilib] Revert throw on nonexistent SimDevice name in SimDeviceSim (w…

…pilibsuite#5053) This breaks current vendor use of SimDeviceSim. This reverts commit d991f6e (wpilibsuite#5041).
Starlight220 · Mar 2, 2023 · 36b9f1c · 36b9f1c
1 parent c1ed7ea
commit 36b9f1c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 21 deletions.
diff --git a/wpilibc/src/main/native/cpp/simulation/SimDeviceSim.cpp b/wpilibc/src/main/native/cpp/simulation/SimDeviceSim.cpp
@@ -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) {}

diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SimDeviceSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SimDeviceSim.java
@@ -25,9 +25,6 @@ public class SimDeviceSim {
    */
   public SimDeviceSim(String name) {
     this(SimDeviceDataJNI.getSimDeviceHandle(name));
-    if (m_handle == 0) {
-      throw new IllegalArgumentException("No sim device exists with name '" + name + "'.");
-    }
   }
 
   /**