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

[sim] Add SimDeviceSim ctor overloads (#3134)

Browse Source 
Better parallelism with SimDevice.create(), so teams don't have to mess with concatenating the index/channel themselves.
This commit is contained in:
Starlight220
2021-02-13 08:17:13 +02:00
committed by GitHub
parent 247420c9c1
commit d447c7dc32
3 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,8 @@
#include <hal/SimDevice.h>
#include <hal/simulation/SimDeviceData.h>
#include <wpi/SmallString.h>
#include <wpi/raw_ostream.h>
using namespace frc;
using namespace frc::sim;
@@ -16,6 +18,22 @@ using namespace frc::sim;
SimDeviceSim::SimDeviceSim(const char* name)
: m_handle{HALSIM_GetSimDeviceHandle(name)} {}
SimDeviceSim::SimDeviceSim(const char* name, int index) {
wpi::SmallString<128> fullname;
wpi::raw_svector_ostream os(fullname);
os << name << '[' << index << ']';
m_handle = HALSIM_GetSimDeviceHandle(fullname.c_str());
}
SimDeviceSim::SimDeviceSim(const char* name, int index, int channel) {
wpi::SmallString<128> fullname;
wpi::raw_svector_ostream os(fullname);
os << name << '[' << index << ',' << channel << ']';
m_handle = HALSIM_GetSimDeviceHandle(fullname.c_str());
}
hal::SimValue SimDeviceSim::GetValue(const char* name) const {
return HALSIM_GetSimValueHandle(m_handle, name);
}

17
wpilibc/src/main/native/include/frc/simulation/SimDeviceSim.h
View File

@@ -25,6 +25,23 @@ class SimDeviceSim {
*/
explicit SimDeviceSim(const char* name);
/**
* Constructs a SimDeviceSim.
*
* @param name name of the SimDevice
* @param index device index number to append to name
*/
SimDeviceSim(const char* name, int index);
/**
* Constructs a SimDeviceSim.
*
* @param name name of the SimDevice
* @param index device index number to append to name
* @param channel device channel number to append to name
*/
SimDeviceSim(const char* name, int index, int channel);
/**
* Get the property object with the given name.
*

21
wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SimDeviceSim.java
View File

@@ -28,6 +28,27 @@ public class SimDeviceSim {
m_handle = SimDeviceDataJNI.getSimDeviceHandle(name);
}
/**
* Constructs a SimDeviceSim.
*
* @param name name of the SimDevice
* @param index device index number to append to name
*/
public SimDeviceSim(String name, int index) {
this(name + "[" + index + "]");
}
/**
* Constructs a SimDeviceSim.
*
* @param name name of the SimDevice
* @param index device index number to append to name
* @param channel device channel number to append to name
*/
public SimDeviceSim(String name, int index, int channel) {
this(name + "[" + index + "," + channel + "]");
}
/**
* Get the property object with the given name.
*