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

Merge "Fixed bug with plugins not including all simulation dependencies."

Browse Source
This commit is contained in:
Alex Henning (WPI)
2014-08-11 08:22:15 -07:00
committed by Gerrit Code Review
parent f4d542b212 657054c9e2
commit 2f655bb49d
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eclipse-plugins/edu.wpi.first.wpilib.plugins.java/pom.xml
View File

@@ -132,6 +132,12 @@
<artifactId>JavaGazebo</artifactId>
<version>0.1.0-SNAPSHOT</version>
</artifactItem>
<artifactItem>
<groupId>edu.wpi.first.wpilibj</groupId>
<artifactId>wpilibJava</artifactId>
<version>0.1.0-SNAPSHOT</version>
<type>jar</type>
</artifactItem>
<artifactItem>
<groupId>edu.wpi.first.wpilibj</groupId>
<artifactId>wpilibJavaSim</artifactId>

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

@@ -153,10 +153,6 @@ public abstract class RobotBase {
*/
public static void main(String args[]) { // TODO: expose main to teams?
boolean errorOnExit = false;
// Set some implementations so that the static methods work properly
Timer.SetImplementation(new SimTimer());
RobotState.SetImplementation(DriverStation.getInstance());
try {
MainNode.openGazeboConnection();
@@ -166,6 +162,10 @@ public abstract class RobotBase {
System.exit(1);
return;
}
// Set some implementations so that the static methods work properly
Timer.SetImplementation(new SimTimer());
RobotState.SetImplementation(DriverStation.getInstance());
String robotName = "";
Enumeration<URL> resources = null;