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

34
hal/src/main/native/sim/Power.cpp
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */
/* Copyright (c) 2017-2020 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -19,46 +19,42 @@ void InitializePower() {}
// TODO: Fix the naming in here
extern "C" {
double HAL_GetVinVoltage(int32_t* status) {
return SimRoboRioData[0].vInVoltage;
}
double HAL_GetVinCurrent(int32_t* status) {
return SimRoboRioData[0].vInCurrent;
}
double HAL_GetVinVoltage(int32_t* status) { return SimRoboRioData->vInVoltage; }
double HAL_GetVinCurrent(int32_t* status) { return SimRoboRioData->vInCurrent; }
double HAL_GetUserVoltage6V(int32_t* status) {
return SimRoboRioData[0].userVoltage6V;
return SimRoboRioData->userVoltage6V;
}
double HAL_GetUserCurrent6V(int32_t* status) {
return SimRoboRioData[0].userCurrent6V;
return SimRoboRioData->userCurrent6V;
}
HAL_Bool HAL_GetUserActive6V(int32_t* status) {
return SimRoboRioData[0].userActive6V;
return SimRoboRioData->userActive6V;
}
int32_t HAL_GetUserCurrentFaults6V(int32_t* status) {
return SimRoboRioData[0].userFaults6V;
return SimRoboRioData->userFaults6V;
}
double HAL_GetUserVoltage5V(int32_t* status) {
return SimRoboRioData[0].userVoltage5V;
return SimRoboRioData->userVoltage5V;
}
double HAL_GetUserCurrent5V(int32_t* status) {
return SimRoboRioData[0].userCurrent5V;
return SimRoboRioData->userCurrent5V;
}
HAL_Bool HAL_GetUserActive5V(int32_t* status) {
return SimRoboRioData[0].userActive5V;
return SimRoboRioData->userActive5V;
}
int32_t HAL_GetUserCurrentFaults5V(int32_t* status) {
return SimRoboRioData[0].userFaults5V;
return SimRoboRioData->userFaults5V;
}
double HAL_GetUserVoltage3V3(int32_t* status) {
return SimRoboRioData[0].userVoltage3V3;
return SimRoboRioData->userVoltage3V3;
}
double HAL_GetUserCurrent3V3(int32_t* status) {
return SimRoboRioData[0].userCurrent3V3;
return SimRoboRioData->userCurrent3V3;
}
HAL_Bool HAL_GetUserActive3V3(int32_t* status) {
return SimRoboRioData[0].userActive3V3;
return SimRoboRioData->userActive3V3;
}
int32_t HAL_GetUserCurrentFaults3V3(int32_t* status) {
return SimRoboRioData[0].userFaults3V3;
return SimRoboRioData->userFaults3V3;
}
} // extern "C"