Commit 04176222 authored by beuchatp's avatar beuchatp
Browse files

Renamed all instances of d_fall_pps to dfall_pkg

parent 35fdab8f
cmake_minimum_required(VERSION 3.0)
project(d_fall_pps)
project(dfall_pkg)
## Add support for C++11, supported in ROS Kinetic and newer
# add_definitions(-std=c++11)
......@@ -321,7 +321,7 @@ include_directories(
## Declare a C++ executable
## With catkin_make all packages are built within a single CMake context
## The recommended prefix ensures that target names across packages don't collide
# add_executable(${PROJECT_NAME}_node src/d_fall_pps_node.cpp)
# add_executable(${PROJECT_NAME}_node src/dfall_pkg_node.cpp)
if(VICON_LIBRARY)
add_executable(ViconDataPublisher src/nodes/ViconDataPublisher.cpp)
......@@ -417,36 +417,36 @@ qt5_use_modules(flyingAgentGUI Widgets)
if(VICON_LIBRARY)
add_dependencies(ViconDataPublisher d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(ViconDataPublisher dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
endif()
add_dependencies(PPSClient d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(BatteryMonitor d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(DefaultControllerService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(SafeControllerService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(DemoControllerService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(StudentControllerService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(MpcControllerService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(RemoteControllerService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(TuningControllerService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(PickerControllerService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(CentralManagerService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(ParameterService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(PPSClient dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(BatteryMonitor dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(DefaultControllerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(SafeControllerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(DemoControllerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(StudentControllerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(MpcControllerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(RemoteControllerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(TuningControllerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(PickerControllerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(CentralManagerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(ParameterService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
# GUI-- dependencies
add_dependencies(my_GUI d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(my_GUI dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
# StudentGUI-- dependencies
add_dependencies(student_GUI d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(student_GUI dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
# FLYING AGENT GUI-- dependencies
add_dependencies(flyingAgentGUI d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(flyingAgentGUI dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
......@@ -553,7 +553,7 @@ target_link_libraries(flyingAgentGUI ${catkin_LIBRARIES})
#############
## Add gtest based cpp test target and link libraries
# catkin_add_gtest(${PROJECT_NAME}-test test/test_d_fall_pps.cpp)
# catkin_add_gtest(${PROJECT_NAME}-test test/test_dfall_pkg.cpp)
# if(TARGET ${PROJECT_NAME}-test)
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
# endif()
......
......@@ -39,11 +39,11 @@
#include <QSvgRenderer>
#ifdef CATKIN_MAKE
#include "d_fall_pps/CrazyflieData.h"
#include "dfall_pkg/CrazyflieData.h"
#endif
#ifdef CATKIN_MAKE
using namespace d_fall_pps;
using namespace dfall_pkg;
#endif
#define DRONE_HEIGHT 100 * FROM_MILIMETERS_TO_UNITS * 1.2
......
......@@ -49,14 +49,14 @@
//#include <std_msgs/String.h>
// Include the DFALL message types
#include "d_fall_pps/IntWithHeader.h"
#include "dfall_pkg/IntWithHeader.h"
#include "marker.h"
#include "crazyFly.h"
#include "CFLinker.h"
// Include the DFALL service types
#include "d_fall_pps/CrazyflieDB.h"
#include "d_fall_pps/CrazyflieEntry.h"
#include "dfall_pkg/CrazyflieDB.h"
#include "dfall_pkg/CrazyflieEntry.h"
// The constants that are sent to the agents in order to
......@@ -79,7 +79,7 @@
#define LOAD_YAML_CUSTOM_CONTROLLER_COORDINATOR 4
using namespace d_fall_pps;
using namespace dfall_pkg;
#endif
......
......@@ -38,12 +38,12 @@
#include <QGraphicsEllipseItem>
#ifdef CATKIN_MAKE
#include "d_fall_pps/UnlabeledMarker.h"
#include "dfall_pkg/UnlabeledMarker.h"
#endif
#ifdef CATKIN_MAKE
using namespace d_fall_pps;
using namespace dfall_pkg;
#endif
#define MARKER_DIAMETER 20 * FROM_MILIMETERS_TO_UNITS
......
......@@ -43,11 +43,11 @@
#include <ros/ros.h>
#include <ros/network.h>
#include "d_fall_pps/UnlabeledMarker.h"
#include "d_fall_pps/CrazyflieData.h"
#include "d_fall_pps/ViconData.h"
#include "dfall_pkg/UnlabeledMarker.h"
#include "dfall_pkg/CrazyflieData.h"
#include "dfall_pkg/ViconData.h"
using namespace d_fall_pps;
using namespace dfall_pkg;
typedef ViconData::ConstPtr ptrToMessage;
......
......@@ -47,11 +47,11 @@
#include <QShortcut>
#ifdef CATKIN_MAKE
#include "d_fall_pps/UnlabeledMarker.h"
#include "d_fall_pps/CMRead.h"
#include "d_fall_pps/CrazyflieEntry.h"
#include "d_fall_pps/CMUpdate.h"
#include "d_fall_pps/CMCommand.h"
#include "dfall_pkg/UnlabeledMarker.h"
#include "dfall_pkg/CMRead.h"
#include "dfall_pkg/CrazyflieEntry.h"
#include "dfall_pkg/CMUpdate.h"
#include "dfall_pkg/CMCommand.h"
#include "nodes/CentralManagerService.h"
#include <ros/ros.h>
......@@ -65,7 +65,7 @@
#define N_MAX_CRAZYFLIES 20 // protection number
#ifdef CATKIN_MAKE
using namespace d_fall_pps;
using namespace dfall_pkg;
#endif
MainGUIWindow::MainGUIWindow(int argc, char **argv, QWidget *parent) :
......@@ -279,7 +279,7 @@ void MainGUIWindow::_init()
// CREATE A NODE HANDLE TO THE ROOT OF THE D-FaLL SYSTEM
ros::NodeHandle nodeHandle_dfall_root("/dfall");
emergencyStopPublisher = nodeHandle_dfall_root.advertise<d_fall_pps::IntWithHeader>("emergencyStop", 1);
emergencyStopPublisher = nodeHandle_dfall_root.advertise<dfall_pkg::IntWithHeader>("emergencyStop", 1);
// Initialise the publisher for sending "commands" from here (the master)
// to all of the agent nodes
......@@ -1108,7 +1108,7 @@ void MainGUIWindow::on_all_land_button_clicked()
// > MOTORS OFF
void MainGUIWindow::on_all_motors_off_button_clicked()
{
d_fall_pps::IntWithHeader msg;
dfall_pkg::IntWithHeader msg;
msg.data = CMD_CRAZYFLY_MOTORS_OFF;
msg.shouldCheckForID = false;
//commandAllAgentsPublisher.publish(msg);
......
......@@ -32,9 +32,9 @@
#include "rosNodeThread_for_managerGUI.h"
#include "d_fall_pps/CMRead.h"
#include "d_fall_pps/CMUpdate.h"
#include "d_fall_pps/CMCommand.h"
#include "dfall_pkg/CMRead.h"
#include "dfall_pkg/CMUpdate.h"
#include "dfall_pkg/CMCommand.h"
rosNodeThread::rosNodeThread(int argc, char** pArgv, const char * node_name, QObject* parent)
......
......@@ -50,17 +50,17 @@
//#include <std_msgs/String.h>
// Include the DFALL message types
#include "d_fall_pps/IntWithHeader.h"
#include "d_fall_pps/AreaBounds.h"
#include "d_fall_pps/CrazyflieContext.h"
#include "d_fall_pps/IntIntService.h"
#include "d_fall_pps/CMQuery.h"
#include "dfall_pkg/IntWithHeader.h"
#include "dfall_pkg/AreaBounds.h"
#include "dfall_pkg/CrazyflieContext.h"
#include "dfall_pkg/IntIntService.h"
#include "dfall_pkg/CMQuery.h"
// Include the shared definitions
#include "nodes/Constants.h"
// SPECIFY THE PACKAGE NAMESPACE
//using namespace d_fall_pps;
//using namespace dfall_pkg;
#else
// Include the shared definitions
......@@ -187,7 +187,7 @@ private:
// Get the type and ID of this node
bool getTypeAndIDParameters();
// Fill the head for a message
void fillIntMessageHeader( d_fall_pps::IntWithHeader & msg );
void fillIntMessageHeader( dfall_pkg::IntWithHeader & msg );
// > For the CrazyRadio status, received on the
// "crazyRadioStatusSubscriber"
......
......@@ -16,19 +16,19 @@
//#include <std_msgs/String.h>
// Include the DFALL message types
//#include "d_fall_pps/IntWithHeader.h"
//#include "d_fall_pps/SetpointWithHeader.h"
#include "d_fall_pps/CrazyflieData.h"
#include "d_fall_pps/ViconData.h"
#include "d_fall_pps/AreaBounds.h"
#include "d_fall_pps/CrazyflieContext.h"
#include "d_fall_pps/CMQuery.h"
//#include "dfall_pkg/IntWithHeader.h"
//#include "dfall_pkg/SetpointWithHeader.h"
#include "dfall_pkg/CrazyflieData.h"
#include "dfall_pkg/ViconData.h"
#include "dfall_pkg/AreaBounds.h"
#include "dfall_pkg/CrazyflieContext.h"
#include "dfall_pkg/CMQuery.h"
// Include the shared definitions
//#include "nodes/Constants.h"
// SPECIFY THE PACKAGE NAMESPACE
//using namespace d_fall_pps;
//using namespace dfall_pkg;
#else
// Include the shared definitions
......@@ -106,8 +106,8 @@ private:
// PRIVATE VARIABLES FOR ROS
// > For the "context" of this agent
d_fall_pps::CrazyflieContext m_context;
d_fall_pps::AreaBounds m_area;
dfall_pkg::CrazyflieContext m_context;
dfall_pkg::AreaBounds m_area;
// SUBSRIBER
// > For the pose data from a motion capture system
......@@ -127,7 +127,7 @@ private:
// > For the controller currently operating, received on
// "controllerUsedSubscriber"
void poseDataReceivedCallback(const d_fall_pps::ViconData& viconData);
void poseDataReceivedCallback(const dfall_pkg::ViconData& viconData);
void controllerUsedChangedCallback(const std_msgs::Int32& msg);
......
......@@ -48,17 +48,17 @@
//#include <std_msgs/String.h>
// Include the DFALL message types
#include "d_fall_pps/IntWithHeader.h"
#include "d_fall_pps/AreaBounds.h"
#include "d_fall_pps/CrazyflieContext.h"
#include "d_fall_pps/CMQuery.h"
#include "d_fall_pps/IntIntService.h"
#include "dfall_pkg/IntWithHeader.h"
#include "dfall_pkg/AreaBounds.h"
#include "dfall_pkg/CrazyflieContext.h"
#include "dfall_pkg/CMQuery.h"
#include "dfall_pkg/IntIntService.h"
// Include the shared definitions
#include "nodes/Constants.h"
// SPECIFY THE PACKAGE NAMESPACE
//using namespace d_fall_pps;
//using namespace dfall_pkg;
#else
// Include the shared definitions
......@@ -175,7 +175,7 @@ private:
// PRIVATE VARIABLES FOR ROS
// > For the "context" of this agent
d_fall_pps::CrazyflieContext my_context;
dfall_pkg::CrazyflieContext my_context;
// PUBLISHERS AND SUBSRIBERS
// > For Crazyradio commands based on button clicks
......
......@@ -17,17 +17,17 @@
//#include <std_msgs/String.h>
// Include the DFALL message types
//#include "d_fall_pps/IntWithHeader.h"
#include "d_fall_pps/SetpointWithHeader.h"
//#include "dfall_pkg/IntWithHeader.h"
#include "dfall_pkg/SetpointWithHeader.h"
// Include the DFALL service types
#include "d_fall_pps/GetSetpointService.h"
#include "dfall_pkg/GetSetpointService.h"
// Include the shared definitions
#include "nodes/Constants.h"
// SPECIFY THE PACKAGE NAMESPACE
//using namespace d_fall_pps;
//using namespace dfall_pkg;
#else
// Include the shared definitions
......@@ -117,10 +117,10 @@ private:
#ifdef CATKIN_MAKE
// For receiving message that the setpoint was changed
void setpointChangedCallback(const d_fall_pps::SetpointWithHeader& newSetpoint);
void setpointChangedCallback(const dfall_pkg::SetpointWithHeader& newSetpoint);
// Fill the header for a message
void fillSetpointMessageHeader( d_fall_pps::SetpointWithHeader & msg );
void fillSetpointMessageHeader( dfall_pkg::SetpointWithHeader & msg );
// Get the paramters that specify the type and ID
bool getTypeAndIDParameters();
......
......@@ -15,18 +15,18 @@
#include <std_msgs/String.h>
// Include the DFALL message types
#include "d_fall_pps/IntWithHeader.h"
#include "d_fall_pps/StringWithHeader.h"
#include "dfall_pkg/IntWithHeader.h"
#include "dfall_pkg/StringWithHeader.h"
// Include the DFALL service types
// #include "d_fall_pps/AreaBounds.h"
// #include "d_fall_pps/CrazyflieContext.h"
// #include "d_fall_pps/CMQuery.h"
// #include "dfall_pkg/AreaBounds.h"
// #include "dfall_pkg/CrazyflieContext.h"
// #include "dfall_pkg/CMQuery.h"
// Include the shared definitions
#include "nodes/Constants.h"
// using namespace d_fall_pps;
// using namespace dfall_pkg;
#else
// Include the shared definitions
......@@ -122,8 +122,8 @@ private:
#ifdef CATKIN_MAKE
// Fill the header for a message
void fillIntMessageHeader( d_fall_pps::IntWithHeader & msg );
void fillStringMessageHeader( d_fall_pps::StringWithHeader & msg );
void fillIntMessageHeader( dfall_pkg::IntWithHeader & msg );
void fillStringMessageHeader( dfall_pkg::StringWithHeader & msg );
// Get the paramters that specify the type and ID
bool getTypeAndIDParameters();
......
......@@ -51,12 +51,12 @@
//#include <std_msgs/String.h>
// Include the DFALL message types
#include "d_fall_pps/StringWithHeader.h"
#include "dfall_pkg/StringWithHeader.h"
#include "nodes/Constants.h"
// Namespacing the package
using namespace d_fall_pps;
using namespace dfall_pkg;
//using namespace std;
#else
......
......@@ -43,19 +43,19 @@
//#include <std_msgs/String.h>
// Include the DFALL message types
//#include "d_fall_pps/IntWithHeader.h"
#include "d_fall_pps/SetpointWithHeader.h"
//#include "d_fall_pps/CustomButtonWithHeader.h"
//#include "dfall_pkg/IntWithHeader.h"
#include "dfall_pkg/SetpointWithHeader.h"
//#include "dfall_pkg/CustomButtonWithHeader.h"
// Include the DFALL service types
#include "d_fall_pps/GetSetpointService.h"
#include "dfall_pkg/GetSetpointService.h"
// Include the shared definitions
#include "nodes/Constants.h"
#include "nodes/PickerControllerConstants.h"
// SPECIFY THE PACKAGE NAMESPACE
//using namespace d_fall_pps;
//using namespace dfall_pkg;
#else
// Include the shared definitions
......@@ -282,10 +282,10 @@ private:
#ifdef CATKIN_MAKE
// For receiving message that the setpoint was changed
void setpointChangedCallback(const d_fall_pps::SetpointWithHeader& newSetpoint);
void setpointChangedCallback(const dfall_pkg::SetpointWithHeader& newSetpoint);
// Fill the header for a message
void fillSetpointMessageHeader( d_fall_pps::SetpointWithHeader & msg );
void fillSetpointMessageHeader( dfall_pkg::SetpointWithHeader & msg );
// Get the paramters that specify the type and ID
bool getTypeAndIDParameters();
......
......@@ -44,15 +44,15 @@
#include <ros/ros.h>
#include <ros/network.h>
#include "d_fall_pps/CMRead.h"
#include "d_fall_pps/CMUpdate.h"
#include "d_fall_pps/CMCommand.h"
#include "dfall_pkg/CMRead.h"
#include "dfall_pkg/CMUpdate.h"
#include "dfall_pkg/CMCommand.h"
//#include "d_fall_pps/UnlabeledMarker.h"
//#include "d_fall_pps/CrazyflieData.h"
//#include "d_fall_pps/ViconData.h"
//#include "dfall_pkg/UnlabeledMarker.h"
//#include "dfall_pkg/CrazyflieData.h"
//#include "dfall_pkg/ViconData.h"
using namespace d_fall_pps;
using namespace dfall_pkg;
//typedef ViconData::ConstPtr ptrToMessage;
......
......@@ -18,18 +18,18 @@
//#include <std_msgs/String.h>
// Include the DFALL message types
//#include "d_fall_pps/IntWithHeader.h"
#include "d_fall_pps/SetpointWithHeader.h"
#include "d_fall_pps/CustomButtonWithHeader.h"
//#include "dfall_pkg/IntWithHeader.h"
#include "dfall_pkg/SetpointWithHeader.h"
#include "dfall_pkg/CustomButtonWithHeader.h"
// Include the DFALL service types
#include "d_fall_pps/GetSetpointService.h"
#include "dfall_pkg/GetSetpointService.h"
// Include the shared definitions
#include "nodes/Constants.h"
// SPECIFY THE PACKAGE NAMESPACE
//using namespace d_fall_pps;
//using namespace dfall_pkg;
#else
// Include the shared definitions
......@@ -129,14 +129,14 @@ private:
#ifdef CATKIN_MAKE
// For receiving message that the setpoint was changed
void setpointChangedCallback(const d_fall_pps::SetpointWithHeader& newSetpoint);
void setpointChangedCallback(const dfall_pkg::SetpointWithHeader& newSetpoint);
// Publish a message when a custom button is pressed
void publish_custom_button_command(int button_index , QLineEdit * lineEdit_pointer);
// Fill the header for a message
void fillSetpointMessageHeader( d_fall_pps::SetpointWithHeader & msg );
void fillCustomButtonMessageHeader( d_fall_pps::CustomButtonWithHeader & msg );
void fillSetpointMessageHeader( dfall_pkg::SetpointWithHeader & msg );
void fillCustomButtonMessageHeader( dfall_pkg::CustomButtonWithHeader & msg );
// Get the paramters that specify the type and ID
bool getTypeAndIDParameters();
......
......@@ -51,16 +51,16 @@
//#include <std_msgs/String.h>
// Include the DFALL message types
#include "d_fall_pps/IntWithHeader.h"
#include "d_fall_pps/AreaBounds.h"
#include "d_fall_pps/CrazyflieContext.h"
#include "d_fall_pps/CMQuery.h"
#include "dfall_pkg/IntWithHeader.h"
#include "dfall_pkg/AreaBounds.h"
#include "dfall_pkg/CrazyflieContext.h"
#include "dfall_pkg/CMQuery.h"
// Include the shared definitions
#include "nodes/Constants.h"
// SPECIFY THE PACKAGE NAMESPACE
//using namespace d_fall_pps;
//using namespace dfall_pkg;
#endif
......@@ -127,7 +127,7 @@ private:
// PRIVATE VARIABLES FOR ROS
// > For the "context" of this agent
d_fall_pps::CrazyflieContext my_context;
dfall_pkg::CrazyflieContext my_context;
// PUBLISHERS AND SUBSRIBERS
......
......@@ -18,19 +18,19 @@
//#include <std_msgs/String.h>
// Include the DFALL message types
//#include "d_fall_pps/IntWithHeader.h"
#include "d_fall_pps/FloatWithHeader.h"
#include "d_fall_pps/SetpointWithHeader.h"
#include "d_fall_pps/CustomButtonWithHeader.h"
//#include "dfall_pkg/IntWithHeader.h"
#include "dfall_pkg/FloatWithHeader.h"
#include "dfall_pkg/SetpointWithHeader.h"
#include "dfall_pkg/CustomButtonWithHeader.h"
// Include the DFALL service types
#include "d_fall_pps/GetSetpointService.h"
#include "dfall_pkg/GetSetpointService.h"
// Include the shared definitions
#include "nodes/Constants.h"
// SPECIFY THE PACKAGE NAMESPACE
//using namespace d_fall_pps;
//using namespace dfall_pkg;
#else
// Include the shared definitions
......@@ -146,14 +146,14 @@ private:
#ifdef CATKIN_MAKE
// For receiving message that the setpoint was changed
void setpointChangedCallback(const d_fall_pps::SetpointWithHeader& newSetpoint);
void setpointChangedCallback(const dfall_pkg::SetpointWithHeader& newSetpoint);
// Publish a message when a custom button is pressed
//void publish_custom_button_command(int button_index , QLineEdit * lineEdit_pointer);
// Fill the header for a message
void fillSetpointMessageHeader( d_fall_pps::SetpointWithHeader & msg );
void fillFloatMessageHeader( d_fall_pps::FloatWithHeader & msg );
void fillSetpointMessageHeader( dfall_pkg::SetpointWithHeader & msg );
void fillFloatMessageHeader( dfall_pkg::FloatWithHeader & msg );
// Get the paramters that specify the type and ID
bool getTypeAndIDParameters();
......