diff --git a/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp b/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp index 771d81f958..0de2004d5b 100644 --- a/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp +++ b/wpilibc/src/main/native/cpp/IterativeRobotBase.cpp @@ -26,29 +26,29 @@ IterativeRobotBase::IterativeRobotBase(double period) m_watchdog(period, [this] { PrintLoopOverrunMessage(); }) {} void IterativeRobotBase::RobotInit() { - wpi::outs() << "Default " << __FUNCTION__ << "() method... Overload me!\n"; + wpi::outs() << "Default " << __FUNCTION__ << "() method... Override me!\n"; } void IterativeRobotBase::DisabledInit() { - wpi::outs() << "Default " << __FUNCTION__ << "() method... Overload me!\n"; + wpi::outs() << "Default " << __FUNCTION__ << "() method... Override me!\n"; } void IterativeRobotBase::AutonomousInit() { - wpi::outs() << "Default " << __FUNCTION__ << "() method... Overload me!\n"; + wpi::outs() << "Default " << __FUNCTION__ << "() method... Override me!\n"; } void IterativeRobotBase::TeleopInit() { - wpi::outs() << "Default " << __FUNCTION__ << "() method... Overload me!\n"; + wpi::outs() << "Default " << __FUNCTION__ << "() method... Override me!\n"; } void IterativeRobotBase::TestInit() { - wpi::outs() << "Default " << __FUNCTION__ << "() method... Overload me!\n"; + wpi::outs() << "Default " << __FUNCTION__ << "() method... Override me!\n"; } void IterativeRobotBase::RobotPeriodic() { static bool firstRun = true; if (firstRun) { - wpi::outs() << "Default " << __FUNCTION__ << "() method... Overload me!\n"; + wpi::outs() << "Default " << __FUNCTION__ << "() method... Override me!\n"; firstRun = false; } } @@ -56,7 +56,7 @@ void IterativeRobotBase::RobotPeriodic() { void IterativeRobotBase::DisabledPeriodic() { static bool firstRun = true; if (firstRun) { - wpi::outs() << "Default " << __FUNCTION__ << "() method... Overload me!\n"; + wpi::outs() << "Default " << __FUNCTION__ << "() method... Override me!\n"; firstRun = false; } } @@ -64,7 +64,7 @@ void IterativeRobotBase::DisabledPeriodic() { void IterativeRobotBase::AutonomousPeriodic() { static bool firstRun = true; if (firstRun) { - wpi::outs() << "Default " << __FUNCTION__ << "() method... Overload me!\n"; + wpi::outs() << "Default " << __FUNCTION__ << "() method... Override me!\n"; firstRun = false; } } @@ -72,7 +72,7 @@ void IterativeRobotBase::AutonomousPeriodic() { void IterativeRobotBase::TeleopPeriodic() { static bool firstRun = true; if (firstRun) { - wpi::outs() << "Default " << __FUNCTION__ << "() method... Overload me!\n"; + wpi::outs() << "Default " << __FUNCTION__ << "() method... Override me!\n"; firstRun = false; } } @@ -80,7 +80,7 @@ void IterativeRobotBase::TeleopPeriodic() { void IterativeRobotBase::TestPeriodic() { static bool firstRun = true; if (firstRun) { - wpi::outs() << "Default " << __FUNCTION__ << "() method... Overload me!\n"; + wpi::outs() << "Default " << __FUNCTION__ << "() method... Override me!\n"; firstRun = false; } } diff --git a/wpilibc/src/main/native/cpp/SampleRobot.cpp b/wpilibc/src/main/native/cpp/SampleRobot.cpp index 338f7beeb1..190f5d804c 100644 --- a/wpilibc/src/main/native/cpp/SampleRobot.cpp +++ b/wpilibc/src/main/native/cpp/SampleRobot.cpp @@ -59,23 +59,23 @@ void SampleRobot::StartCompetition() { } void SampleRobot::RobotInit() { - wpi::outs() << "Default " << __FUNCTION__ << "() method... Overload me!\n"; + wpi::outs() << "Default " << __FUNCTION__ << "() method... Override me!\n"; } void SampleRobot::Disabled() { - wpi::outs() << "Default " << __FUNCTION__ << "() method... Overload me!\n"; + wpi::outs() << "Default " << __FUNCTION__ << "() method... Override me!\n"; } void SampleRobot::Autonomous() { - wpi::outs() << "Default " << __FUNCTION__ << "() method... Overload me!\n"; + wpi::outs() << "Default " << __FUNCTION__ << "() method... Override me!\n"; } void SampleRobot::OperatorControl() { - wpi::outs() << "Default " << __FUNCTION__ << "() method... Overload me!\n"; + wpi::outs() << "Default " << __FUNCTION__ << "() method... Override me!\n"; } void SampleRobot::Test() { - wpi::outs() << "Default " << __FUNCTION__ << "() method... Overload me!\n"; + wpi::outs() << "Default " << __FUNCTION__ << "() method... Override me!\n"; } void SampleRobot::RobotMain() { m_robotMainOverridden = false; } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobotBase.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobotBase.java index ee13ef9a4b..9dfcb64ec9 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobotBase.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/IterativeRobotBase.java @@ -86,7 +86,7 @@ public abstract class IterativeRobotBase extends RobotBase { * never indicate that the code is ready, causing the robot to be bypassed in a match. */ public void robotInit() { - System.out.println("Default robotInit() method... Overload me!"); + System.out.println("Default robotInit() method... Override me!"); } /** @@ -96,7 +96,7 @@ public abstract class IterativeRobotBase extends RobotBase { * robot enters disabled mode. */ public void disabledInit() { - System.out.println("Default disabledInit() method... Overload me!"); + System.out.println("Default disabledInit() method... Override me!"); } /** @@ -106,7 +106,7 @@ public abstract class IterativeRobotBase extends RobotBase { * robot enters autonomous mode. */ public void autonomousInit() { - System.out.println("Default autonomousInit() method... Overload me!"); + System.out.println("Default autonomousInit() method... Override me!"); } /** @@ -116,7 +116,7 @@ public abstract class IterativeRobotBase extends RobotBase { * robot enters teleop mode. */ public void teleopInit() { - System.out.println("Default teleopInit() method... Overload me!"); + System.out.println("Default teleopInit() method... Override me!"); } /** @@ -127,7 +127,7 @@ public abstract class IterativeRobotBase extends RobotBase { */ @SuppressWarnings("PMD.JUnit4TestShouldUseTestAnnotation") public void testInit() { - System.out.println("Default testInit() method... Overload me!"); + System.out.println("Default testInit() method... Override me!"); } /* ----------- Overridable periodic code ----------------- */ @@ -139,7 +139,7 @@ public abstract class IterativeRobotBase extends RobotBase { */ public void robotPeriodic() { if (m_rpFirstRun) { - System.out.println("Default robotPeriodic() method... Overload me!"); + System.out.println("Default robotPeriodic() method... Override me!"); m_rpFirstRun = false; } } @@ -151,7 +151,7 @@ public abstract class IterativeRobotBase extends RobotBase { */ public void disabledPeriodic() { if (m_dpFirstRun) { - System.out.println("Default disabledPeriodic() method... Overload me!"); + System.out.println("Default disabledPeriodic() method... Override me!"); m_dpFirstRun = false; } } @@ -163,7 +163,7 @@ public abstract class IterativeRobotBase extends RobotBase { */ public void autonomousPeriodic() { if (m_apFirstRun) { - System.out.println("Default autonomousPeriodic() method... Overload me!"); + System.out.println("Default autonomousPeriodic() method... Override me!"); m_apFirstRun = false; } } @@ -175,7 +175,7 @@ public abstract class IterativeRobotBase extends RobotBase { */ public void teleopPeriodic() { if (m_tpFirstRun) { - System.out.println("Default teleopPeriodic() method... Overload me!"); + System.out.println("Default teleopPeriodic() method... Override me!"); m_tpFirstRun = false; } } @@ -188,7 +188,7 @@ public abstract class IterativeRobotBase extends RobotBase { @SuppressWarnings("PMD.JUnit4TestShouldUseTestAnnotation") public void testPeriodic() { if (m_tmpFirstRun) { - System.out.println("Default testPeriodic() method... Overload me!"); + System.out.println("Default testPeriodic() method... Override me!"); m_tmpFirstRun = false; } } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SampleRobot.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SampleRobot.java index 6c13013cbb..aac7cad9dd 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SampleRobot.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SampleRobot.java @@ -55,7 +55,7 @@ public class SampleRobot extends RobotBase { } /** - * Disabled should go here. Users should overload this method to run code that should run while + * Disabled should go here. Users should override this method to run code that should run while * the field is disabled. * *

Called once each time the robot enters the disabled state.