diff --git a/.gitignore b/.gitignore
index 8b4d2f3d1dd56c435c2034481b9f8e5b2af0a8e4..47d7e8668a818bb6c8bc9664772af85c5175d1cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,33 @@
pps_ws/build/
pps_ws/devel/
pps_ws/src/CMakeLists.txt
+
+./pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/crtpstack.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/radiodriver.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/exceptions.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/__init__.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/crtpdriver.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/usbdriver.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/udpdriver.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/debugdriver.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/serialdriver.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/platformservice.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/param.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/commander.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/__init__.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/log.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/console.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/toccache.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/mem.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/toc.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/drivers/__init__.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/drivers/crazyradio.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/drivers/cfusb.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/__init__.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/utils/callbacks.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/utils/__init__.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/bootloader/boottypes.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/bootloader/__init__.pyc
+./pps_ws/src/d_fall_pps/crazyradio/cflib/bootloader/cloader.pyc
+./pps_ws/src/d_fall_pps/crazyradio/leapsdk/__init__.pyc
+
diff --git a/pps_ws/src/d_fall_gui/CMakeLists.txt b/pps_ws/src/d_fall_gui/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7e291b71a36414d1f870d39692b74801e1a8c4ff
--- /dev/null
+++ b/pps_ws/src/d_fall_gui/CMakeLists.txt
@@ -0,0 +1,199 @@
+cmake_minimum_required(VERSION 2.8.3)
+project(d_fall_gui)
+
+## Add support for C++11, supported in ROS Kinetic and newer
+# add_definitions(-std=c++11)
+
+## Find catkin macros and libraries
+## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
+## is used, also find other catkin packages
+find_package(catkin REQUIRED COMPONENTS
+ roscpp
+ rospy
+ std_msgs
+)
+
+## System dependencies are found with CMake's conventions
+# find_package(Boost REQUIRED COMPONENTS system)
+
+
+## Uncomment this if the package has a setup.py. This macro ensures
+## modules and global scripts declared therein get installed
+## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
+# catkin_python_setup()
+
+################################################
+## Declare ROS messages, services and actions ##
+################################################
+
+## To declare and build messages, services or actions from within this
+## package, follow these steps:
+## * Let MSG_DEP_SET be the set of packages whose message types you use in
+## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
+## * In the file package.xml:
+## * add a build_depend tag for "message_generation"
+## * add a build_depend and a run_depend tag for each package in MSG_DEP_SET
+## * If MSG_DEP_SET isn't empty the following dependency has been pulled in
+## but can be declared for certainty nonetheless:
+## * add a run_depend tag for "message_runtime"
+## * In this file (CMakeLists.txt):
+## * add "message_generation" and every package in MSG_DEP_SET to
+## find_package(catkin REQUIRED COMPONENTS ...)
+## * add "message_runtime" and every package in MSG_DEP_SET to
+## catkin_package(CATKIN_DEPENDS ...)
+## * uncomment the add_*_files sections below as needed
+## and list every .msg/.srv/.action file to be processed
+## * uncomment the generate_messages entry below
+## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...)
+
+## Generate messages in the 'msg' folder
+# add_message_files(
+# FILES
+# Message1.msg
+# Message2.msg
+# )
+
+## Generate services in the 'srv' folder
+# add_service_files(
+# FILES
+# Service1.srv
+# Service2.srv
+# )
+
+## Generate actions in the 'action' folder
+# add_action_files(
+# FILES
+# Action1.action
+# Action2.action
+# )
+
+## Generate added messages and services with any dependencies listed here
+# generate_messages(
+# DEPENDENCIES
+# std_msgs
+# )
+
+################################################
+## Declare ROS dynamic reconfigure parameters ##
+################################################
+
+## To declare and build dynamic reconfigure parameters within this
+## package, follow these steps:
+## * In the file package.xml:
+## * add a build_depend and a run_depend tag for "dynamic_reconfigure"
+## * In this file (CMakeLists.txt):
+## * add "dynamic_reconfigure" to
+## find_package(catkin REQUIRED COMPONENTS ...)
+## * uncomment the "generate_dynamic_reconfigure_options" section below
+## and list every .cfg file to be processed
+
+## Generate dynamic reconfigure parameters in the 'cfg' folder
+# generate_dynamic_reconfigure_options(
+# cfg/DynReconf1.cfg
+# cfg/DynReconf2.cfg
+# )
+
+###################################
+## catkin specific configuration ##
+###################################
+## The catkin_package macro generates cmake config files for your package
+## Declare things to be passed to dependent projects
+## INCLUDE_DIRS: uncomment this if you package contains header files
+## LIBRARIES: libraries you create in this project that dependent projects also need
+## CATKIN_DEPENDS: catkin_packages dependent projects also need
+## DEPENDS: system dependencies of this project that dependent projects also need
+catkin_package(
+# INCLUDE_DIRS include
+# LIBRARIES d_fall_gui
+# CATKIN_DEPENDS roscpp rospy std_msgs
+# DEPENDS system_lib
+)
+
+###########
+## Build ##
+###########
+
+## Specify additional locations of header files
+## Your package locations should be listed before other locations
+# include_directories(include)
+include_directories(
+ ${catkin_INCLUDE_DIRS}
+)
+
+## Declare a C++ library
+# add_library(${PROJECT_NAME}
+# src/${PROJECT_NAME}/d_fall_gui.cpp
+# )
+
+## Add cmake target dependencies of the library
+## as an example, code may need to be generated before libraries
+## either from message generation or dynamic reconfigure
+# add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
+
+## 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_gui_node.cpp)
+
+## Rename C++ executable without prefix
+## The above recommended prefix causes long target names, the following renames the
+## target back to the shorter version for ease of user use
+## e.g. "rosrun someones_pkg node" instead of "rosrun someones_pkg someones_pkg_node"
+# set_target_properties(${PROJECT_NAME}_node PROPERTIES OUTPUT_NAME node PREFIX "")
+
+## Add cmake target dependencies of the executable
+## same as for the library above
+# add_dependencies(${PROJECT_NAME}_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
+
+## Specify libraries to link a library or executable target against
+# target_link_libraries(${PROJECT_NAME}_node
+# ${catkin_LIBRARIES}
+# )
+
+#############
+## Install ##
+#############
+
+# all install targets should use catkin DESTINATION variables
+# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html
+
+## Mark executable scripts (Python etc.) for installation
+## in contrast to setup.py, you can choose the destination
+# install(PROGRAMS
+# scripts/my_python_script
+# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+# )
+
+## Mark executables and/or libraries for installation
+# install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_node
+# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+# )
+
+## Mark cpp header files for installation
+# install(DIRECTORY include/${PROJECT_NAME}/
+# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
+# FILES_MATCHING PATTERN "*.h"
+# PATTERN ".svn" EXCLUDE
+# )
+
+## Mark other files for installation (e.g. launch and bag files, etc.)
+# install(FILES
+# # myfile1
+# # myfile2
+# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
+# )
+
+#############
+## Testing ##
+#############
+
+## Add gtest based cpp test target and link libraries
+# catkin_add_gtest(${PROJECT_NAME}-test test/test_d_fall_gui.cpp)
+# if(TARGET ${PROJECT_NAME}-test)
+# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
+# endif()
+
+## Add folders to be run by python nosetests
+# catkin_add_nosetests(test)
diff --git a/pps_ws/src/d_fall_gui/package.xml b/pps_ws/src/d_fall_gui/package.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fe725eedbacd8e466e5e27fa4b61fb9828a1b1bd
--- /dev/null
+++ b/pps_ws/src/d_fall_gui/package.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<package>
+ <name>d_fall_gui</name>
+ <version>0.0.0</version>
+ <description>The d_fall_gui package</description>
+
+ <!-- One maintainer tag required, multiple allowed, one person per tag -->
+ <!-- Example: -->
+ <!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
+ <maintainer email="crazyflie@todo.todo">crazyflie</maintainer>
+
+
+ <!-- One license tag required, multiple allowed, one license per tag -->
+ <!-- Commonly used license strings: -->
+ <!-- BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->
+ <license>TODO</license>
+
+
+ <!-- Url tags are optional, but multiple are allowed, one per tag -->
+ <!-- Optional attribute type can be: website, bugtracker, or repository -->
+ <!-- Example: -->
+ <!-- <url type="website">http://wiki.ros.org/d_fall_gui</url> -->
+
+
+ <!-- Author tags are optional, multiple are allowed, one per tag -->
+ <!-- Authors do not have to be maintainers, but could be -->
+ <!-- Example: -->
+ <!-- <author email="jane.doe@example.com">Jane Doe</author> -->
+
+
+ <!-- The *_depend tags are used to specify dependencies -->
+ <!-- Dependencies can be catkin packages or system dependencies -->
+ <!-- Examples: -->
+ <!-- Use build_depend for packages you need at compile time: -->
+ <!-- <build_depend>message_generation</build_depend> -->
+ <!-- Use buildtool_depend for build tool packages: -->
+ <!-- <buildtool_depend>catkin</buildtool_depend> -->
+ <!-- Use run_depend for packages you need at runtime: -->
+ <!-- <run_depend>message_runtime</run_depend> -->
+ <!-- Use test_depend for packages you need only for testing: -->
+ <!-- <test_depend>gtest</test_depend> -->
+ <buildtool_depend>catkin</buildtool_depend>
+ <build_depend>roscpp</build_depend>
+ <build_depend>rospy</build_depend>
+ <build_depend>std_msgs</build_depend>
+ <run_depend>roscpp</run_depend>
+ <run_depend>rospy</run_depend>
+ <run_depend>std_msgs</run_depend>
+
+
+ <!-- The export tag contains other, unspecified, tags -->
+ <export>
+ <!-- Other tools can request additional information be placed here -->
+
+ </export>
+</package>
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/__init__.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/__init__.pyc
deleted file mode 100644
index f5e936ccbb0fd4da975be38c2a121c3f618e5b17..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/__init__.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/bootloader/__init__.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/bootloader/__init__.pyc
deleted file mode 100755
index 7a9308cd970b3857545387746bf010b61da7192f..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/bootloader/__init__.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/bootloader/boottypes.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/bootloader/boottypes.pyc
deleted file mode 100755
index 90d465f1d2cbc96f07d096ca87420d253950c703..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/bootloader/boottypes.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/bootloader/cloader.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/bootloader/cloader.pyc
deleted file mode 100755
index 2e08af236fe20c0ef672a99b002bf7af340b8cea..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/bootloader/cloader.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/__init__.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/__init__.pyc
deleted file mode 100644
index b09a12f550842caeaa953ba1c7a810c6c4aaaf89..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/__init__.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/commander.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/commander.pyc
deleted file mode 100644
index 1a4551165f13f85143fbb07424587f5960cf074a..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/commander.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/console.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/console.pyc
deleted file mode 100644
index 7eda3dbedd01ce70ec7b102c900beb60cab58b61..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/console.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/log.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/log.pyc
deleted file mode 100644
index d210b97174cb49fbd0506298c0ccae2dd1f3d8e8..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/log.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/mem.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/mem.pyc
deleted file mode 100644
index 81bb975962c1dd992cb3a97871cedbca6f3738ce..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/mem.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/param.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/param.pyc
deleted file mode 100644
index 300adf07e0912abb81c395eab49e516c272d5c0f..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/param.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/platformservice.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/platformservice.pyc
deleted file mode 100644
index c983623f14c9112fa7340dc67dae8cf239564dad..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/platformservice.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/toc.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/toc.pyc
deleted file mode 100644
index 4f1b78dbfca9968abd4baa1f92115eb83a5a37ac..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/toc.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/toccache.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/toccache.pyc
deleted file mode 100644
index b8a5da1d4d2221ea5b2848d45378c56f3f277164..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/crazyflie/toccache.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/__init__.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/__init__.pyc
deleted file mode 100644
index d51361206bc0697d66635adddef42367f3445640..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/__init__.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/crtpdriver.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/crtpdriver.pyc
deleted file mode 100644
index ccd50c1a2b57d9278b134e4e69ca71755eafaea9..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/crtpdriver.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/crtpstack.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/crtpstack.pyc
deleted file mode 100644
index 442e4dafa5e3fe75cdaf89fafdabe6efc3fad89e..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/crtpstack.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/debugdriver.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/debugdriver.pyc
deleted file mode 100644
index 6b2576f59196bc4b770a3d5df22a1ff1427fd798..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/debugdriver.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/exceptions.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/exceptions.pyc
deleted file mode 100644
index 60f4731de97ab8939d73b92c20b3cf87f32cdbfe..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/exceptions.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/radiodriver.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/radiodriver.pyc
deleted file mode 100644
index ba8b4dd57c47ce72b0371ab0982658814c939458..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/radiodriver.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/serialdriver.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/serialdriver.pyc
deleted file mode 100644
index a750b4443eac55cb030929271f9cd05899348aec..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/serialdriver.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/udpdriver.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/udpdriver.pyc
deleted file mode 100644
index d1bd738f1d44c57b3967c315484bead65cc82ee4..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/udpdriver.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/usbdriver.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/usbdriver.pyc
deleted file mode 100644
index ce85a2d9158d09302e4287d02ca52494a49aea28..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/crtp/usbdriver.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/drivers/__init__.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/drivers/__init__.pyc
deleted file mode 100644
index 3a1be3d44723ddc6e2148aa5d17d34b9b6948f6e..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/drivers/__init__.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/drivers/cfusb.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/drivers/cfusb.pyc
deleted file mode 100644
index 8c8e137aa5f0c8add477e9fb323ae6583c6f6e8d..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/drivers/cfusb.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/drivers/crazyradio.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/drivers/crazyradio.pyc
deleted file mode 100644
index fc0771ba3cc7a0596f8cb15beeb6f4c3ad6c6b0c..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/drivers/crazyradio.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/utils/__init__.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/utils/__init__.pyc
deleted file mode 100644
index 9a836124b1252f7c20851b151691a737f68a4bde..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/utils/__init__.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/cflib/utils/callbacks.pyc b/pps_ws/src/d_fall_pps/crazyradio/cflib/utils/callbacks.pyc
deleted file mode 100644
index 74e35185cd8928cfd392adc026a7e4c35c1703a1..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/cflib/utils/callbacks.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/crazyradio/leapsdk/__init__.pyc b/pps_ws/src/d_fall_pps/crazyradio/leapsdk/__init__.pyc
deleted file mode 100755
index e6513482535ac9c98b047a49e71c2c2a61f75aa9..0000000000000000000000000000000000000000
Binary files a/pps_ws/src/d_fall_pps/crazyradio/leapsdk/__init__.pyc and /dev/null differ
diff --git a/pps_ws/src/d_fall_pps/src/CentralManagerService.cpp b/pps_ws/src/d_fall_pps/src/CentralManagerService.cpp
index 8a767b6877c5a4fad1d5e1edd9a2b887196de370..2cb409def71d7f60f688b5bf55d9646d7b9a5a08 100644
--- a/pps_ws/src/d_fall_pps/src/CentralManagerService.cpp
+++ b/pps_ws/src/d_fall_pps/src/CentralManagerService.cpp
@@ -21,19 +21,17 @@
using namespace d_fall_pps;
-/*TODO:
-request from paul
-Specificy controller in a file
+//receive request from students (containing (maybe among other things) their name)
+//send them back the CrazyflieContext (containing (maybe among other things) the area to fly in)
+bool returnCrazyflieContext(CentralManager::Request &request, CentralManager::Response &response) {
+ ROS_INFO("central manager");
+ return true;
+}
-*/
-bool returnCrazyflieContext(CentralManager::Request &request, CentralManager::Response &response) {
- ROS_INFO("cnetal manager");
- return true;
-}
int main(int argc, char* argv[]) {
ros::init(argc, argv, "CentralManagerService");
diff --git a/pps_ws/src/d_fall_pps/src/PPSClient.cpp b/pps_ws/src/d_fall_pps/src/PPSClient.cpp
index b466559290c67c1f89bb6352b953070fc68b8975..276b2824ed9b03658e5f16a24c3c8dddb83bd52d 100644
--- a/pps_ws/src/d_fall_pps/src/PPSClient.cpp
+++ b/pps_ws/src/d_fall_pps/src/PPSClient.cpp
@@ -61,19 +61,6 @@ bool safetyCheck(ViconData data){
//not void: sould give back controlldata
void ppsClientToController(ViconData data, bool autocontrol){
if(data.crazyflieName == cflie){
- /* unnecessairy: just send data!!!!!
- d_fall_pps::ViconData myDataToPublish;
- myDataToPublish.crazyflieName = data.crazyflieName;
- myDataToPublish.x = data.x;
- myDataToPublish.y = data.y;
- myDataToPublish.z = data.z;
- myDataToPublish.roll = data.roll;
- myDataToPublish.pitch = data.pitch;
- myDataToPublish.yaw = data.yaw;
- myDataToPublish.acquiringTime = data.acquiringTime;
- */
-
-
//TODO:
//Some way of choosing the correct controller: Safe or Custom
//using the area data
@@ -116,7 +103,7 @@ void viconCallback(const d_fall_pps::ViconData& data){
//debugging
//++callbackCalls;
//ROS_INFO("Callback called #%d",callbackCalls);
- //ROS_INFO("Recived Pitch in this callback: %f", data.pitch);
+ //ROS_INFO("Received Pitch in this callback: %f", data.pitch);
//ROS_INFO("received data:"); ROS_INFO_STREAM(data);
//ROS_INFO("My teamname is:"); ROS_INFO_STREAM(team);
//ROS_INFO("My crazyflie is:"); ROS_INFO_STREAM(cflie);
@@ -204,9 +191,9 @@ int main(int argc, char* argv[]){
//ros::Publishers to advertise on the three command type topics
- angleCommandPublisher = nodeHandle.advertise <d_fall_pps::AngleCommand>("AngleCommand", 1000);
- rateCommandPublisher = nodeHandle.advertise<d_fall_pps::RateCommand>("RateCommand", 1000);
- motorCommandPublisher = nodeHandle.advertise <d_fall_pps::MotorCommand>("MotorCommand", 1000);
+ angleCommandPublisher = nodeHandle.advertise <d_fall_pps::AngleCommand>("AngleCommand", 1);
+ rateCommandPublisher = nodeHandle.advertise<d_fall_pps::RateCommand>("RateCommand", 1);
+ motorCommandPublisher = nodeHandle.advertise <d_fall_pps::MotorCommand>("MotorCommand", 1);
//service: now only one available: to add several services depending on controller