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

Java now asks the HAL if it is a simulation or not (#647)

Browse Source
This commit is contained in:
pjreiniger
2017-09-23 10:56:53 -04:00
committed by Peter Johnson
parent 6e1be897de
commit db4981f166
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java
View File

@@ -20,6 +20,7 @@ import edu.wpi.first.networktables.NetworkTableInstance;
import edu.wpi.first.wpilibj.hal.FRCNetComm.tInstances;
import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType;
import edu.wpi.first.wpilibj.hal.HAL;
import edu.wpi.first.wpilibj.hal.HALUtil;
import edu.wpi.first.wpilibj.internal.HardwareHLUsageReporting;
import edu.wpi.first.wpilibj.internal.HardwareTimer;
import edu.wpi.first.wpilibj.livewindow.LiveWindow;
@@ -77,7 +78,7 @@ public abstract class RobotBase {
* @return If the robot is running in simulation.
*/
public static boolean isSimulation() {
return false;
return !isReal();
}
/**
@@ -86,7 +87,7 @@ public abstract class RobotBase {
* @return If the robot is running in the real world.
*/
public static boolean isReal() {
return true;
return HALUtil.getHALRuntimeType() == 0;
}
/**