Fix C++ example compilation

wpilibsuite · May 21, 2024 · 6d8611e · 6d8611e
1 parent 043f5d3
commit 6d8611e
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 39 deletions.
diff --git a/wpilibcExamples/src/main/cpp/examples/AprilTagsVision/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/AprilTagsVision/cpp/Robot.cpp
@@ -32,6 +32,19 @@
  * solution!
  */
 class Robot : public frc::TimedRobot {
+ public:
+  Robot() {
+    // We need to run our vision program in a separate thread. If not, our robot
+    // program will not run.
+#if defined(__linux__) || defined(_WIN32)
+    std::thread visionThread(VisionThread);
+    visionThread.detach();
+#else
+    std::fputs("Vision only available on Linux or Windows.\n", stderr);
+    std::fflush(stderr);
+#endif
+  }
+
 #if defined(__linux__) || defined(_WIN32)
 
  private:
@@ -147,18 +160,6 @@ class Robot : public frc::TimedRobot {
     }
   }
 #endif
-
-  Robot() {
-    // We need to run our vision program in a separate thread. If not, our robot
-    // program will not run.
-#if defined(__linux__) || defined(_WIN32)
-    std::thread visionThread(VisionThread);
-    visionThread.detach();
-#else
-    std::fputs("Vision only available on Linux or Windows.\n", stderr);
-    std::fflush(stderr);
-#endif
-  }
 };
 
 #ifndef RUNNING_FRC_TESTS

diff --git a/wpilibcExamples/src/main/cpp/examples/Gyro/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Gyro/cpp/Robot.cpp
@@ -17,17 +17,15 @@
  */
 class Robot : public frc::TimedRobot {
  public:
-  Robot() {
-    wpi::SendableRegistry::AddChild(&m_drive, &m_left);
-    wpi::SendableRegistry::AddChild(&m_drive, &m_right);
-  }
-
   Robot() {
     m_gyro.SetSensitivity(kVoltsPerDegreePerSecond);
     // We need to invert one side of the drivetrain so that positive voltages
     // result in both sides moving forward. Depending on how your robot's
     // gearbox is constructed, you might have to invert the left side instead.
     m_right.SetInverted(true);
+
+    wpi::SendableRegistry::AddChild(&m_drive, &m_left);
+    wpi::SendableRegistry::AddChild(&m_drive, &m_right);
   }
 
   /**

diff --git a/wpilibcExamples/src/main/cpp/examples/HttpCamera/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/HttpCamera/cpp/Robot.cpp
@@ -15,6 +15,14 @@
  * processing.
  */
 class Robot : public frc::TimedRobot {
+ public:
+  Robot() {
+    // We need to run our vision program in a separate thread. If not, our robot
+    // program will not run.
+    std::thread visionThread(VisionThread);
+    visionThread.detach();
+  }
+
  private:
   static void VisionThread() {
     // Create an HTTP camera. The address will need to be modified to have the
@@ -50,13 +58,6 @@ class Robot : public frc::TimedRobot {
       outputStream.PutFrame(mat);
     }
   }
-
-  Robot() {
-    // We need to run our vision program in a separate thread. If not, our robot
-    // program will not run.
-    std::thread visionThread(VisionThread);
-    visionThread.detach();
-  }
 };
 
 #ifndef RUNNING_FRC_TESTS

diff --git a/wpilibcExamples/src/main/cpp/examples/IntermediateVision/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/IntermediateVision/cpp/Robot.cpp
@@ -18,6 +18,19 @@
  * processing.
  */
 class Robot : public frc::TimedRobot {
+ public:
+  Robot() {
+    // We need to run our vision program in a separate thread. If not, our robot
+    // program will not run.
+#if defined(__linux__) || defined(_WIN32)
+    std::thread visionThread(VisionThread);
+    visionThread.detach();
+#else
+    std::fputs("Vision only available on Linux or Windows.\n", stderr);
+    std::fflush(stderr);
+#endif
+  }
+
 #if defined(__linux__) || defined(_WIN32)
 
  private:
@@ -55,18 +68,6 @@ class Robot : public frc::TimedRobot {
     }
   }
 #endif
-
-  Robot() {
-    // We need to run our vision program in a separate thread. If not, our robot
-    // program will not run.
-#if defined(__linux__) || defined(_WIN32)
-    std::thread visionThread(VisionThread);
-    visionThread.detach();
-#else
-    std::fputs("Vision only available on Linux or Windows.\n", stderr);
-    std::fflush(stderr);
-#endif
-  }
 };
 
 #ifndef RUNNING_FRC_TESTS

diff --git a/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/cpp/Robot.cpp
@@ -22,8 +22,6 @@ void Robot::Teleop() {}
 void Robot::Test() {}
 
 void Robot::StartCompetition() {
-  RobotInit();
-
   frc::internal::DriverStationModeThread modeThread;
 
   wpi::Event event{false, false};

diff --git a/wpilibcExamples/src/main/cpp/templates/timesliceskeleton/include/Robot.h b/wpilibcExamples/src/main/cpp/templates/timesliceskeleton/include/Robot.h
@@ -10,7 +10,6 @@ class Robot : public frc::TimesliceRobot {
  public:
   Robot();
 
-  Robot();
   void RobotPeriodic() override;
 
   void AutonomousInit() override;