fixed ros2 bug

Author: agilexrobotics

include/ugv_sdk/mobile_robot/ranger_robot.hpp

@@ -17,7 +17,6 @@
 namespace westonrobot {
 class RangerRobot : public RobotCommonInterface, public RangerInterface {
  public:
-  RangerRobot(bool is_mini_v1);
  enum class Variant {
   kRangerMiniV1 = 0,
   kRangerMiniV2,
@@ -32,7 +31,7 @@ class RangerRobot : public RobotCommonInterface, public RangerInterface {
   bool Connect(std::string can_name) override;
 
   void EnableCommandedMode() override;
-  std::string RequestVersion(int timeout_sec) override;
+  std::string RequestVersion(int timeout_sec = 3) override;
 
   // functions to be implemented by each robot class
   void ResetRobotState() override;

sample/ranger_demo/ranger_robot_demo.cpp

@@ -6,6 +6,7 @@
  * @Mail      : [email protected]
  * Copyright  : AgileX Robotics
  **/
+#include <string>
 
 #include <iomanip>
 
@@ -15,7 +16,7 @@ using namespace westonrobot;
 
 int main(int argc, char *argv[]) {
   std::string device_name;
-  bool is_mini_v1 = false;
+  RangerRobot::Variant variant = RangerRobot::Variant::kRanger;
 
   if (argc == 2) {
     device_name = {argv[1]};
@@ -24,19 +25,28 @@ int main(int argc, char *argv[]) {
     device_name = {argv[1]};
     std::string check = argv[2];
     if (check == "mini_v1") {
-      is_mini_v1 = true;
+      variant = RangerRobot::Variant::kRangerMiniV1;
       std::cout << "Specified mini v1" << std::endl;
+    } else if (check == "mini_v2") {
+      variant = RangerRobot::Variant::kRangerMiniV2;
+      std::cout << "Specified mini v2" << std::endl;
+    } else if (check == "mini_v3") {
+      variant = RangerRobot::Variant::kRangerMiniV3;
+      std::cout << "Specified mini v3" << std::endl;
+    } else {
+      std::cout << "Default to ranger base" << std::endl;
     }
     std::cout << "Specified CAN: " << device_name << std::endl;
   } else {
     std::cout << "Usage: app_ranger_demo <interface> <ranger_model>"
               << std::endl
-              << "Example 1: ./app_ranger_demo can0 mini_v1" << std::endl;
+              << "Example 1: ./app_ranger_demo can0 <mini_v1, mini_v2, mini_v3>"
+              << std::endl;
     return -1;
   }
 
   // RangerMiniV1Robot ranger;
-  auto ranger = std::make_shared<RangerRobot>(is_mini_v1);
+  auto ranger = std::make_shared<RangerRobot>(variant);
   ranger->Connect(device_name);
   ranger->EnableCommandedMode();
 
@@ -92,4 +102,4 @@ int main(int argc, char *argv[]) {
     ++count;
   }
   return 0;
-}
+}

sample/tracer_demo/tracer_robot_demo.cpp

@@ -31,7 +31,6 @@ int main(int argc, char **argv) {
   }
 
   std::unique_ptr<TracerRobot> tracer;
-  tracer = std::unique_ptr<TracerRobot>(new TracerRobot());
   if (tracer == nullptr)
     std::cout << "Failed to create robot object" << std::endl;