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

Merge "Update version number for Release 3 Print distinctive message on robot program startup Change-Id: Ic91b81bd298ee6730503933cf0e733702e4b4405"

Browse Source
This commit is contained in:
Fred Silberberg (WPI)
2016-01-24 16:07:23 -08:00
committed by Gerrit Code Review
parent f913b5de8c 61dbd43664
commit d62256156e
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wpilibc/Athena/src/RobotBase.cpp
View File

@@ -27,6 +27,7 @@ void RobotBase::setInstance(RobotBase *robot) {
RobotBase &RobotBase::getInstance() { return *m_instance; }
void RobotBase::robotSetup(RobotBase *robot) {
printf("\n********** Robot program starting **********\n");
robot->StartCompetition();
}
@@ -55,7 +56,7 @@ RobotBase::RobotBase() : m_ds(DriverStation::GetInstance()) {
file = fopen("/tmp/frc_versions/FRC_Lib_Version.ini", "w");
if (file != nullptr) {
fputs("2016 C++ Beta5.0", file);
fputs("2016 C++ Release 3", file);
fclose(file);
}
}

3
wpilibj/src/athena/java/edu/wpi/first/wpilibj/RobotBase.java
View File

@@ -223,7 +223,7 @@ public abstract class RobotBase {
output = new FileOutputStream(file);
output.write("2016 Java Beta5.0".getBytes());
output.write("2016 Java Release 3".getBytes());
} catch (IOException ex) {
ex.printStackTrace();
@@ -238,6 +238,7 @@ public abstract class RobotBase {
boolean errorOnExit = false;
try {
System.out.println("********** Robot program starting **********");
robot.startCompetition();
} catch (Throwable t) {
DriverStation.reportError(