diff --git a/scout_base/CMakeLists.txt b/scout_base/CMakeLists.txt index 413e441..8e858e2 100644 --- a/scout_base/CMakeLists.txt +++ b/scout_base/CMakeLists.txt @@ -51,10 +51,6 @@ set_property(TARGET scout_messenger PROPERTY POSITION_INDEPENDENT_CODE ON) add_executable(scout_base_node src/scout_base_node.cpp) target_link_libraries(scout_base_node scout_messenger ${catkin_LIBRARIES}) -add_executable(scout_base_sim_node src/scout_base_sim_node.cpp) -target_link_libraries(scout_base_sim_node scout_messenger ${catkin_LIBRARIES}) - - ############# ## Install ## ############# diff --git a/scout_base/src/scout_base_sim_node.cpp b/scout_base/src/scout_base_sim_node.cpp deleted file mode 100644 index 594f2f1..0000000 --- a/scout_base/src/scout_base_sim_node.cpp +++ /dev/null @@ -1,46 +0,0 @@ -#include - -#include -#include -#include -#include - -#include "scout_sdk/scout_base.hpp" -#include "scout_base/scout_messenger.hpp" - -using namespace wescore; - -int main(int argc, char **argv) -{ - // setup ROS node - ros::init(argc, argv, "scout_odom"); - ros::NodeHandle node(""), private_node("~"); - - // instantiate a robot object - ScoutBase robot; - ScoutROSMessenger messenger(&robot, &node); - - // fetch parameters before connecting to robot - std::string port_name; - private_node.param("odom_frame", messenger.odom_frame_, std::string("odom")); - private_node.param("base_frame", messenger.base_frame_, std::string("base_link")); - private_node.param("simulated_robot", messenger.simulated_robot_, true); - private_node.param("control_rate", messenger.sim_control_rate_, 50); - - // no connection for simulated robot - // setup ROS subscription - messenger.SetupSubscription(); - - // publish robot state at 50Hz while listening to twist commands - double linear, angular; - ros::Rate rate_50hz(50); // 50Hz - while (true) - { - messenger.GetCurrentMotionCmdForSim(linear, angular); - messenger.PublishSimStateToROS(linear, angular); - ros::spinOnce(); - rate_50hz.sleep(); - } - - return 0; -} \ No newline at end of file diff --git a/scout_gazebo_sim/launch/scout_empty_world.launch b/scout_gazebo_sim/launch/scout_empty_world.launch index 6a68c6b..c816709 100644 --- a/scout_gazebo_sim/launch/scout_empty_world.launch +++ b/scout_gazebo_sim/launch/scout_empty_world.launch @@ -1,5 +1,4 @@ -