build passing, remove migration markers, fix typos

unl-nimbus-lab · Nov 15, 2020 · fd41b5e · fd41b5e
1 parent 6e348ad
commit fd41b5e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/autopilot_handler/apm_handler/CMakeLists.txt b/autopilot_handler/apm_handler/CMakeLists.txt
@@ -5,7 +5,7 @@ project(apm_handler)
 add_compile_options(-std=c++11 -O3)
 
 find_package(catkin REQUIRED COMPONENTS
-  common_msgs
+  freyja_msgs
   geometry_msgs
   roscpp
   std_msgs
@@ -16,7 +16,7 @@ find_package(catkin REQUIRED COMPONENTS
 catkin_package(
 #  INCLUDE_DIRS include
 #  LIBRARIES apm_handler
-#  CATKIN_DEPENDS common_msgs geometry_msgs roscpp std_msgs tf
+#  CATKIN_DEPENDS freyja_msgs geometry_msgs roscpp std_msgs tf
 #  DEPENDS system_lib
 )
 

diff --git a/autopilot_handler/apm_handler/package.xml b/autopilot_handler/apm_handler/package.xml
@@ -49,18 +49,18 @@
   <!-- Use doc_depend for packages you need only for building documentation: -->
   <!--   <doc_depend>doxygen</doc_depend> -->
   <buildtool_depend>catkin</buildtool_depend>
-  <build_depend>common_msgs</build_depend>
+  <build_depend>freyja_msgs</build_depend>
   <build_depend>geometry_msgs</build_depend>
   <build_depend>roscpp</build_depend>
   <build_depend>std_msgs</build_depend>
   <build_depend>tf</build_depend>
   <build_depend>mavros</build_depend>
-  <build_export_depend>common_msgs</build_export_depend>
+  <build_export_depend>freyja_msgs</build_export_depend>
   <build_export_depend>geometry_msgs</build_export_depend>
   <build_export_depend>roscpp</build_export_depend>
   <build_export_depend>std_msgs</build_export_depend>
   <build_export_depend>tf</build_export_depend>
-  <exec_depend>common_msgs</exec_depend>
+  <exec_depend>freyja_msgs</exec_depend>
   <exec_depend>geometry_msgs</exec_depend>
   <exec_depend>roscpp</exec_depend>
   <exec_depend>std_msgs</exec_depend>

diff --git a/autopilot_handler/apm_handler/src/mavros_translate.cpp b/autopilot_handler/apm_handler/src/mavros_translate.cpp
@@ -36,7 +36,7 @@ double THRUST_MIN = 0.02;
 double THRUST_SCALER = 200.0;
 
 typedef mavros_msgs::AttitudeTarget AttiTarget;
-typedef common_msgs::CtrlCommand::ConstPtr CtrlInput;
+typedef freyja_msgs::CtrlCommand::ConstPtr CtrlInput;
 
 uint8_t ignore_rates = AttiTarget::IGNORE_ROLL_RATE |
                         AttiTarget::IGNORE_PITCH_RATE; // |

diff --git a/freyja_trajectory_provider/CMakeLists.txt b/freyja_trajectory_provider/CMakeLists.txt
@@ -15,7 +15,7 @@ find_package(catkin REQUIRED COMPONENTS
 
 
 catkin_package(
-  INCLUDE_DIRS include
+#  INCLUDE_DIRS include
 #  LIBRARIES trajectory_provider
   CATKIN_DEPENDS geometry_msgs message_generation message_runtime roscpp std_msgs
 #  DEPENDS system_lib

diff --git a/lqg_controller/src/lqr_control_bias.cpp b/lqg_controller/src/lqr_control_bias.cpp
@@ -8,7 +8,7 @@
    -- aj / 17th Nov, 2017.
 */
 
-#include "lqg_control_bias.h"
+#include "lqr_control_bias.h"
 
 #define ROS_NODE_NAME "lqg_control"
 #define pi 3.1416

diff --git a/state_manager/include/freya_filters.cpp → state_manager/include/freyja_filters.cpp b/state_manager/include/freya_filters.cpp → state_manager/include/freyja_filters.cpp