Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-30 02:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "match templates with robot builder."

Browse Source
This commit is contained in:
Brad Miller (WPI)
2014-11-26 08:34:03 -08:00
committed by Gerrit Code Review
parent 81840b2c49 c98f54dbbc
commit f590cda8f9
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/command-based/Robot.cpp
View File

@@ -23,7 +23,8 @@ private:
void AutonomousInit()
{
autonomousCommand->Start();
if (autonomousCommand != NULL)
autonomousCommand->Start();
}
void AutonomousPeriodic()
@@ -37,7 +38,8 @@ private:
// teleop starts running. If you want the autonomous to
// continue until interrupted by another command, remove
// this line or comment it out.
autonomousCommand->Cancel();
if (autonomousCommand != NULL)
autonomousCommand->Cancel();
}
void TeleopPeriodic()

4
eclipse-plugins/edu.wpi.first.wpilib.plugins.java/resources/templates/command-based/Robot.java
View File

@@ -38,7 +38,7 @@ public class Robot extends IterativeRobot {
public void autonomousInit() {
// schedule the autonomous command (example)
autonomousCommand.start();
if (autonomousCommand != null) autonomousCommand.start();
}
/**
@@ -53,7 +53,7 @@ public class Robot extends IterativeRobot {
// teleop starts running. If you want the autonomous to
// continue until interrupted by another command, remove
// this line or comment it out.
autonomousCommand.cancel();
if (autonomousCommand != null) autonomousCommand.cancel();
}
/**