Remove things that needed to be delete in merge of PR #27 #28

robotique-ecam · Feb 8, 2021 · 7d197a8 · 7d197a8
1 parent 1e9f406
commit 7d197a8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/src/assurancetourix/assurancetourix/src/assurancetourix.cpp b/src/assurancetourix/assurancetourix/src/assurancetourix.cpp
@@ -72,7 +72,6 @@ Assurancetourix::Assurancetourix() : Node("assurancetourix") {
 
   timer_ = this->create_wall_timer(std::chrono::milliseconds(1000 / refresh_frequency), std::bind(&Assurancetourix::simulation_marker_callback, this));
 #endif
-  //timer_ = this->create_wall_timer(0.3s, std::bind(&Assurancetourix::detect, this)); // to remove for PR
   RCLCPP_INFO(this->get_logger(), "Assurancetourix has been started");
 }
 

diff --git a/src/modules/drive/include/drive.hpp b/src/modules/drive/include/drive.hpp
@@ -10,7 +10,6 @@
 #include <webots/PositionSensor.hpp>
 #endif
 #include "std_srvs/srv/set_bool.hpp"
-#include "std_srvs/srv/trigger.hpp"
 #include "actuators_srvs/srv/slider.hpp"
 #include "nav_msgs/msg/odometry.hpp"
 #include "sensor_msgs/msg/joint_state.hpp"
-Original file line number
+Diff line change
@@ Expand Up @@
       timer_ = this->create_wall_timer(std::chrono::milliseconds(1000 / refresh_frequency), std::bind(&Assurancetourix::simulation_marker_callback, this));
     #endif
-      //timer_ = this->create_wall_timer(0.3s, std::bind(&Assurancetourix::detect, this)); // to remove for PR
       RCLCPP_INFO(this->get_logger(), "Assurancetourix has been started");
     }
@@ Expand Down @@