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

Reverted RobotBase debugging changes from Peter.

Browse Source 
Change-Id: I336b63bae0f751fe846a13d702e01c80e53831cf
This commit is contained in:
Brad Miller
2015-11-07 12:01:44 -05:00
parent 7023013c4b
commit 28f55802b5
1 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,6 @@ import edu.wpi.first.wpilibj.communication.FRCNetworkCommunicationsLibrary.tReso
import edu.wpi.first.wpilibj.communication.UsageReporting;
import edu.wpi.first.wpilibj.internal.HardwareHLUsageReporting;
import edu.wpi.first.wpilibj.internal.HardwareTimer;
import edu.wpi.first.wpilibj.networktables.NetworkTablesJNI;
import edu.wpi.first.wpilibj.networktables.NetworkTable;
import edu.wpi.first.wpilibj.Utility;
@@ -45,12 +44,6 @@ public abstract class RobotBase {
protected final DriverStation m_ds;
private static class MyLogger implements NetworkTablesJNI.LoggerFunction {
public void apply(int level, String file, int line, String msg) {
System.err.println(msg);
}
}
/**
* Constructor for a generic robot program. User code should be placed in the
* constructor that runs before the Autonomous or Operator Control period
@@ -66,7 +59,6 @@ public abstract class RobotBase {
// TODO: See if the next line is necessary
// Resource.RestartProgram();
NetworkTablesJNI.setLogger(new MyLogger(), 0);
NetworkTable.setNetworkIdentity("Robot");
NetworkTable.setServerMode();// must be before b
m_ds = DriverStation.getInstance();
@@ -202,21 +194,21 @@ public abstract class RobotBase {
UsageReporting.report(tResourceType.kResourceType_Language, tInstances.kLanguage_Java);
String robotName = "MyRobot";
//Enumeration<URL> resources = null;
//try {
// resources = RobotBase.class.getClassLoader().getResources("META-INF/MANIFEST.MF");
//} catch (IOException e) {
// e.printStackTrace();
//}
//while (resources != null && resources.hasMoreElements()) {
// try {
// Manifest manifest = new Manifest(resources.nextElement().openStream());
// robotName = manifest.getMainAttributes().getValue("Robot-Class");
// } catch (IOException e) {
// e.printStackTrace();
// }
//}
String robotName = "";
Enumeration<URL> resources = null;
try {
resources = RobotBase.class.getClassLoader().getResources("META-INF/MANIFEST.MF");
} catch (IOException e) {
e.printStackTrace();
}
while (resources != null && resources.hasMoreElements()) {
try {
Manifest manifest = new Manifest(resources.nextElement().openStream());
robotName = manifest.getMainAttributes().getValue("Robot-Class");
} catch (IOException e) {
e.printStackTrace();
}
}
RobotBase robot;
try {