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

Fixed function ordering in robot base classes (#553)

Browse Source
This commit is contained in:
Tyler Veness
2017-07-01 01:12:28 -04:00
committed by Peter Johnson
parent 68b63632c4
commit d34c844900
3 changed files with 67 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wpilibc/athena/include/IterativeRobot.h
View File

@@ -43,10 +43,9 @@ namespace frc {
* - TestPeriodic()
*
*/
class IterativeRobot : public RobotBase {
public:
virtual void StartCompetition();
void StartCompetition() override;
virtual void RobotInit();
virtual void DisabledInit();
@@ -61,8 +60,8 @@ class IterativeRobot : public RobotBase {
virtual void TestPeriodic();
protected:
virtual ~IterativeRobot() = default;
IterativeRobot() = default;
virtual ~IterativeRobot() = default;
private:
bool m_disabledInitialized = false;

9
wpilibc/athena/include/SampleRobot.h
View File

@@ -13,15 +13,18 @@ namespace frc {
class SampleRobot : public RobotBase {
public:
SampleRobot();
virtual ~SampleRobot() = default;
void StartCompetition() override;
virtual void RobotInit();
virtual void Disabled();
virtual void Autonomous();
virtual void OperatorControl();
virtual void Test();
virtual void RobotMain();
void StartCompetition();
protected:
SampleRobot();
virtual ~SampleRobot() = default;
private:
bool m_robotMainOverridden;