Commit 63e4a175 authored by mastefan's avatar mastefan
Browse files

Merge remote-tracking branch 'origin/pragash' into mothership

parents d41e92f9 539f5653
/opt/ros/kinetic/share/catkin/cmake/toplevel.cmake
\ No newline at end of file
/opt/ros/melodic/share/catkin/cmake/toplevel.cmake
\ No newline at end of file
......@@ -48,7 +48,7 @@
#include "d_fall_pps/CrazyflieDB.h"
#include "d_fall_pps/CrazyflieEntry.h"
#include "d_fall_pps/CustomControllerYAML.h"
//#include "d_fall_pps/CustomControllerYAML.h"
#include <std_msgs/Int32.h>
......
......@@ -63,7 +63,7 @@
#include "d_fall_pps/DebugMsg.h"
#include "d_fall_pps/CustomButton.h"
#include "d_fall_pps/ViconSubscribeObjectName.h"
#include "d_fall_pps/CustomControllerYAML.h"
//#include "d_fall_pps/CustomControllerYAML.h"
// Include the Parameter Service shared definitions
#include "nodes/ParameterServiceDefinitions.h"
......@@ -476,4 +476,4 @@ void viconCallback(const ViconData& viconData);
// ACTIVATE REMOTE CONTROL MODE MESSAGE CALLBACK
void shouldActivateCallback(const std_msgs::Int32& msg);
// ******************************************************************************* //
\ No newline at end of file
// ******************************************************************************* //
......@@ -56,7 +56,7 @@
#include "d_fall_pps/ControlCommand.h"
#include "d_fall_pps/Controller.h"
#include "d_fall_pps/DebugMsg.h"
#include "d_fall_pps/CustomControllerYAML.h"
//#include "d_fall_pps/CustomControllerYAML.h"
#include "d_fall_pps/CustomButton.h"
// Include the Parameter Service shared definitions
......@@ -222,4 +222,4 @@ bool getParameterBool(ros::NodeHandle& nodeHandle, std::string name);
void yamlReadyForFetchCallback(const std_msgs::Int32& msg);
void fetchYamlParameters(ros::NodeHandle& nodeHandle);
void processFetchedParameters();
//void customYAMLasMessageCallback(const CustomControllerYAML& newCustomControllerParameters);
\ No newline at end of file
//void customYAMLasMessageCallback(const CustomControllerYAML& newCustomControllerParameters);
......@@ -63,7 +63,7 @@
#include "d_fall_pps/DebugMsg.h"
#include "d_fall_pps/CustomButton.h"
#include "d_fall_pps/ViconSubscribeObjectName.h"
#include "d_fall_pps/CustomControllerYAML.h"
//#include "d_fall_pps/CustomControllerYAML.h"
// Include the Parameter Service shared definitions
#include "nodes/ParameterServiceDefinitions.h"
......@@ -497,4 +497,4 @@ void horizontalGainCallback(const std_msgs::Int32& msg);
void verticalGainCallback(const std_msgs::Int32& msg);
void headingGainCallback(const std_msgs::Int32& msg);
// ******************************************************************************* //
\ No newline at end of file
// ******************************************************************************* //
......@@ -56,7 +56,7 @@
#include "d_fall_pps/ControlCommand.h"
#include "d_fall_pps/Controller.h"
#include "d_fall_pps/DebugMsg.h"
#include "d_fall_pps/CustomControllerYAML.h"
//#include "d_fall_pps/CustomControllerYAML.h"
// Include the Parameter Service shared definitions
#include "nodes/ParameterServiceDefinitions.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment