AcutronicRobotics · LanderU · May 10, 2019 · May 8, 2019 · May 8, 2019 · May 10, 2019
diff --git a/...omponents/HROSCognitionMaraComponents.hpp → ...s/include/HROSCognitionMaraComponents.hpp b/...omponents/HROSCognitionMaraComponents.hpp → ...s/include/HROSCognitionMaraComponents.hpp
diff --git a/hros_cognition_mara_components/src/HROSCognitionMaraComponents.cpp b/hros_cognition_mara_components/src/HROSCognitionMaraComponents.cpp
@@ -1,4 +1,4 @@
-#include "hros_cognition_mara_components/HROSCognitionMaraComponents.hpp"
+#include "HROSCognitionMaraComponents.hpp"
 
 HROSCognitionMaraComponentsNode::HROSCognitionMaraComponentsNode(const std::string & node_name,
                    int argc, char **argv, bool intra_process_comms )

diff --git a/hros_cognition_mara_components/src/TopicCommand.cpp b/hros_cognition_mara_components/src/TopicCommand.cpp
@@ -1,4 +1,4 @@
-#include "hros_cognition_mara_components/HROSCognitionMaraComponents.hpp"
+#include "HROSCognitionMaraComponents.hpp"
 
 void HROSCognitionMaraComponentsNode::commandCallback(const trajectory_msgs::msg::JointTrajectory::SharedPtr msg)
 {

diff --git a/hros_cognition_mara_components/src/TopicState.cpp b/hros_cognition_mara_components/src/TopicState.cpp
@@ -1,4 +1,4 @@
-#include "hros_cognition_mara_components/HROSCognitionMaraComponents.hpp"
+#include "HROSCognitionMaraComponents.hpp"
 
 void HROSCognitionMaraComponentsNode::stateCallback(std::string motor_name, float velocity, float position, float effort)
 {

diff --git a/hros_cognition_mara_components/src/main.cpp b/hros_cognition_mara_components/src/main.cpp
@@ -1,4 +1,4 @@
-#include "hros_cognition_mara_components/HROSCognitionMaraComponents.hpp"
+#include "HROSCognitionMaraComponents.hpp"
 
 #include <rttest/rttest.h>
 #include <unistd.h>

diff --git a/mara_description/CMakeLists.txt b/mara_description/CMakeLists.txt
@@ -12,16 +12,10 @@ endif()
 find_package(ament_cmake REQUIRED)
 find_package(urdf REQUIRED)
 
-install(DIRECTORY meshes urdf material launch rviz
+install(DIRECTORY meshes urdf material rviz
   DESTINATION share/${PROJECT_NAME}
 )
 
-install(
-  PROGRAMS
-  scripts/mara_state_publisher.py
-  DESTINATION lib/${PROJECT_NAME}
-)
-
 ament_export_dependencies(xacro)
 ament_export_dependencies(urdf)
 ament_export_dependencies(material)

diff --git a/mara_description/launch/mara_demo_launch.py b/mara_description/launch/mara_demo_launch.py
diff --git a/mara_description/scripts/mara_state_publisher.py b/mara_description/scripts/mara_state_publisher.py
diff --git a/mara_gazebo/CMakeLists.txt b/mara_gazebo/CMakeLists.txt
@@ -12,7 +12,7 @@ endif()
 find_package(ament_cmake REQUIRED)
 find_package(urdf REQUIRED)
 
-install(DIRECTORY worlds launch
+install(DIRECTORY launch
   DESTINATION share/${PROJECT_NAME}
 )
 

diff --git a/mara_gazebo/worlds/empty_speed_up.world b/mara_gazebo/worlds/empty_speed_up.world