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

[sim] Remove index from RoboRIO simulation interface (#2567)

Browse Source
This commit is contained in:
Peter Johnson
2020-07-04 00:44:56 -07:00
committed by GitHub
parent c4b8a2505d
commit 1851ba1434
9 changed files with 635 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
hal/src/main/native/sim/mockdata/RoboRioData.cpp
View File

@@ -13,8 +13,8 @@ using namespace hal;
namespace hal {
namespace init {
void InitializeRoboRioData() {
static RoboRioData srrd[1];
::hal::SimRoboRioData = srrd;
static RoboRioData srrd;
::hal::SimRoboRioData = &srrd;
}
} // namespace init
} // namespace hal
@@ -39,13 +39,11 @@ void RoboRioData::ResetData() {
}
extern "C" {
void HALSIM_ResetRoboRioData(int32_t index) {
SimRoboRioData[index].ResetData();
}
void HALSIM_ResetRoboRioData(void) { SimRoboRioData->ResetData(); }
#define DEFINE_CAPI(TYPE, CAPINAME, LOWERNAME) \
HAL_SIMDATAVALUE_DEFINE_CAPI(TYPE, HALSIM, RoboRio##CAPINAME, \
SimRoboRioData, LOWERNAME)
#define DEFINE_CAPI(TYPE, CAPINAME, LOWERNAME) \
HAL_SIMDATAVALUE_DEFINE_CAPI_NOINDEX(TYPE, HALSIM, RoboRio##CAPINAME, \
SimRoboRioData, LOWERNAME)
DEFINE_CAPI(HAL_Bool, FPGAButton, fpgaButton)
DEFINE_CAPI(double, VInVoltage, vInVoltage)
@@ -64,10 +62,9 @@ DEFINE_CAPI(int32_t, UserFaults5V, userFaults5V)
DEFINE_CAPI(int32_t, UserFaults3V3, userFaults3V3)
#define REGISTER(NAME) \
SimRoboRioData[index].NAME.RegisterCallback(callback, param, initialNotify)
SimRoboRioData->NAME.RegisterCallback(callback, param, initialNotify)
void HALSIM_RegisterRoboRioAllCallbacks(int32_t index,
HAL_NotifyCallback callback,
void HALSIM_RegisterRoboRioAllCallbacks(HAL_NotifyCallback callback,
void* param, HAL_Bool initialNotify) {
REGISTER(fpgaButton);
REGISTER(vInVoltage);