Merge pull request #35 from ROBOTIS-GIT/develop

toolbox bug fixed
ROBOTIS-GIT · Apr 24, 2017 · f66ba55 · f66ba55
2 parents fdeb617 + 8b49853
commit f66ba55
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/dynamixel_workbench_toolbox/CMakeLists.txt b/dynamixel_workbench_toolbox/CMakeLists.txt
@@ -55,7 +55,7 @@ install(DIRECTORY include/${PROJECT_NAME}/
   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
 )
 
-install(DIRECTORY dynamixel/
+install(DIRECTORY dynamixel_workbench_toolbox/
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
 

diff --git a/..._toolbox/dynamixel/models/model_info.list → ...rkbench_toolbox/dynamixel/model_info.list b/..._toolbox/dynamixel/models/model_info.list → ...rkbench_toolbox/dynamixel/model_info.list
diff --git a/dynamixel_workbench_toolbox/src/dynamixel_tool.cpp b/dynamixel_workbench_toolbox/src/dynamixel_tool.cpp
@@ -92,7 +92,7 @@ DynamixelTool::~DynamixelTool(){}
 
 bool DynamixelTool::getModelName(uint16_t model_number)
 {
-  dynamixel_name_path_  = ros::package::getPath("dynamixel_workbench_toolbox") + "/dynamixel/models/model_info.list";
+  dynamixel_name_path_  = ros::package::getPath("dynamixel_workbench_toolbox") + "/dynamixel/model_info.list";
 
   std::ifstream file(dynamixel_name_path_.c_str());
   if (file.is_open())