From 473c9ea4a155a609fc7548377225e72655ebb05f Mon Sep 17 00:00:00 2001 From: David Date: Wed, 22 Feb 2017 05:15:49 +0000 Subject: [PATCH] config allowed --- CMakeLists.txt | 4 ++-- launch/xbeemav.launch | 4 ++-- src/XMLConfigParser.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a54cab7..962e5a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,8 +56,8 @@ include_directories( add_executable(xbee_mav src/Xbee.cpp src/XBeeFrame.cpp src/SerialDevice.cpp src/CommunicationManager.cpp) target_link_libraries(xbee_mav ${catkin_LIBRARIES}) -#add_executable(config src/main.cpp src/XBeeModule.cpp src/XMLConfigParser.cpp) -#target_link_libraries(config ${catkin_LIBRARIES}) +add_executable(config src/main.cpp src/XBeeModule.cpp src/XMLConfigParser.cpp) +target_link_libraries(config ${catkin_LIBRARIES}) #add_executable(test_controller src/TestController.cpp) #target_link_libraries(test_controller ${catkin_LIBRARIES}) diff --git a/launch/xbeemav.launch b/launch/xbeemav.launch index b2e7c80..ead9515 100644 --- a/launch/xbeemav.launch +++ b/launch/xbeemav.launch @@ -1,8 +1,8 @@ - - + + diff --git a/src/XMLConfigParser.cpp b/src/XMLConfigParser.cpp index 525e75e..42ad314 100644 --- a/src/XMLConfigParser.cpp +++ b/src/XMLConfigParser.cpp @@ -23,7 +23,7 @@ XMLConfigParser::~XMLConfigParser() //***************************************************************************** bool XMLConfigParser::Load_Config() { - const std::string FILE_NAME = "/home/mistlab/catkin_ws/src/xbee_ros_node/Resources/XBee_Config.xml"; + const std::string FILE_NAME = "/home/ubuntu/ROS_WS/src/xbeemav/Resources/XBee_Config.xml"; if (Check_Config_File_Exists(FILE_NAME)) {