From a82674038599deda70c33c9e4df88364e7de5bdb Mon Sep 17 00:00:00 2001 From: beuchatp <beuchatp@control.ee.ethz.ch> Date: Tue, 31 Oct 2017 23:14:21 +0100 Subject: [PATCH] Adapted license header to match with the ETH Zurich requirements --- .../GUI_Qt/CrazyFlyGUI/include/CFLinker.h | 31 +++++++++---- .../GUI_Qt/CrazyFlyGUI/include/centerMarker.h | 31 +++++++++---- .../GUI_Qt/CrazyFlyGUI/include/channelLUT.h | 31 +++++++++---- .../CrazyFlyGUI/include/cornergrabber.h | 31 +++++++++---- .../GUI_Qt/CrazyFlyGUI/include/crazyFly.h | 31 +++++++++---- .../GUI_Qt/CrazyFlyGUI/include/crazyFlyZone.h | 31 +++++++++---- .../CrazyFlyGUI/include/crazyFlyZoneTab.h | 31 +++++++++---- .../CrazyFlyGUI/include/globalDefinitions.h | 31 +++++++++---- .../CrazyFlyGUI/include/mainguiwindow.h | 30 ++++++++++--- .../GUI_Qt/CrazyFlyGUI/include/marker.h | 30 ++++++++++--- .../CrazyFlyGUI/include/myGraphicsRectItem.h | 33 ++++++++++---- .../CrazyFlyGUI/include/myGraphicsScene.h | 31 +++++++++---- .../CrazyFlyGUI/include/myGraphicsView.h | 31 +++++++++---- .../CrazyFlyGUI/include/rosNodeThread.h | 31 +++++++++---- .../GUI_Qt/CrazyFlyGUI/include/tablePiece.h | 31 +++++++++---- .../GUI_Qt/CrazyFlyGUI/src/CFLinker.cpp | 31 +++++++++---- .../GUI_Qt/CrazyFlyGUI/src/centerMarker.cpp | 31 +++++++++---- .../GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp | 31 +++++++++---- .../GUI_Qt/CrazyFlyGUI/src/cornergrabber.cpp | 31 +++++++++---- .../GUI_Qt/CrazyFlyGUI/src/crazyFly.cpp | 31 +++++++++---- .../GUI_Qt/CrazyFlyGUI/src/crazyFlyZone.cpp | 31 +++++++++---- .../CrazyFlyGUI/src/crazyFlyZoneTab.cpp | 31 +++++++++---- .../GUI_Qt/CrazyFlyGUI/src/main.cpp | 31 +++++++++---- .../GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp | 30 ++++++++++--- .../GUI_Qt/CrazyFlyGUI/src/marker.cpp | 30 ++++++++++--- .../CrazyFlyGUI/src/myGraphicsRectItem.cpp | 33 ++++++++++---- .../CrazyFlyGUI/src/myGraphicsScene.cpp | 31 +++++++++---- .../GUI_Qt/CrazyFlyGUI/src/myGraphicsView.cpp | 31 +++++++++---- .../GUI_Qt/CrazyFlyGUI/src/rosNodeThread.cpp | 31 +++++++++---- .../GUI_Qt/CrazyFlyGUI/src/tablePiece.cpp | 31 +++++++++---- .../src/d_fall_pps/crazyradio/CrazyRadio.py | 44 +++++++++++++------ .../include/CentralManagerService.h | 32 ++++++++++++++ pps_ws/src/d_fall_pps/include/CrazyflieIO.h | 32 ++++++++++++++ .../d_fall_pps/src/CentralManagerService.cpp | 30 ++++++++++--- .../src/CircleControllerService.cpp | 30 ++++++++++--- pps_ws/src/d_fall_pps/src/CrazyflieIO.cpp | 30 ++++++++++--- .../src/CustomControllerService.cpp | 29 +++++++++--- .../d_fall_pps/src/FollowCrazyflieService.cpp | 30 ++++++++++--- .../src/d_fall_pps/src/FollowN_1Service.cpp | 30 ++++++++++--- pps_ws/src/d_fall_pps/src/PPSClient.cpp | 30 ++++++++++--- .../d_fall_pps/src/SafeControllerService.cpp | 30 ++++++++++--- .../src/d_fall_pps/src/ViconDataPublisher.cpp | 30 ++++++++++--- 42 files changed, 992 insertions(+), 315 deletions(-) diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/CFLinker.h b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/CFLinker.h index be2b4a91..cd98353c 100644 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/CFLinker.h +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/CFLinker.h @@ -1,19 +1,34 @@ -// Links the crazyflies with the student ids and with the crazyflie zones -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Links the crazyflies with the student ids and with the crazyflie zones +// +// ---------------------------------------------------------------------------------- + #ifndef CFLINKER_H #define CFLINKER_H diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/centerMarker.h b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/centerMarker.h index b36d513a..f76d5a70 100644 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/centerMarker.h +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/centerMarker.h @@ -1,19 +1,34 @@ -// Marker for the center of the Crazyflie Zone -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Marker for the center of the Crazyflie Zone +// +// ---------------------------------------------------------------------------------- + #ifndef CENTER_MARKER_H #define CENTER_MARKER_H diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/channelLUT.h b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/channelLUT.h index b62928e2..150d8ad3 100644 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/channelLUT.h +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/channelLUT.h @@ -1,19 +1,34 @@ -// Look up table that connects the crazyflie names with their respective radio addresses -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Look up table that connects the crazyflie names with their respective radio addresses +// +// ---------------------------------------------------------------------------------- + #ifndef ADDRESSLUT_H #define ADDRESSLUT_H diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/cornergrabber.h b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/cornergrabber.h index 1cea65cf..279225bc 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/cornergrabber.h +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/cornergrabber.h @@ -1,19 +1,34 @@ -// Cornergrabber that allows to dynamically change the size of tables and crazyflie zones -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Cornergrabber that allows to dynamically change the size of tables and crazyflie zones +// +// ---------------------------------------------------------------------------------- + #ifndef CORNERGRABBER_H #define CORNERGRABBER_H diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFly.h b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFly.h index 262d3be6..dc818987 100644 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFly.h +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFly.h @@ -1,19 +1,34 @@ -// Crazyflie object, representation of a Crazyflie in the scene -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Crazyflie object, representation of a Crazyflie in the scene +// +// ---------------------------------------------------------------------------------- + #ifndef CRAZYFLY_H #define CRAZYFLY_H diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFlyZone.h b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFlyZone.h index 9c4dbb5e..ea643be1 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFlyZone.h +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFlyZone.h @@ -1,19 +1,34 @@ -// Rectangular zone that we will be able to link to a crazyflie -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Rectangular zone that we will be able to link to a crazyflie +// +// ---------------------------------------------------------------------------------- + #ifndef CRAZYFLYZONE_H #define CRAZYFLYZONE_H diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFlyZoneTab.h b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFlyZoneTab.h index 7e812cb5..c7a32916 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFlyZoneTab.h +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/crazyFlyZoneTab.h @@ -1,19 +1,34 @@ -// Tab that is created when we create a crazyflie zone -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Tab that is created when we create a crazyflie zone +// +// ---------------------------------------------------------------------------------- + #ifndef CRAZYFLYZONETAB_H #define CRAZYFLYZONETAB_H diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/globalDefinitions.h b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/globalDefinitions.h index e2d9668d..c25a843d 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/globalDefinitions.h +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/globalDefinitions.h @@ -1,19 +1,34 @@ -// Useful global definitions -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Useful global definitions +// +// ---------------------------------------------------------------------------------- + #ifndef GLOBAL_DEFINITIONS_H #define GLOBAL_DEFINITIONS_H diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/mainguiwindow.h b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/mainguiwindow.h index 9ac6af82..9e2fd351 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/mainguiwindow.h +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/mainguiwindow.h @@ -1,18 +1,34 @@ -// Teacher's GUI main window header. -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Teacher's GUI main window header. +// +// ---------------------------------------------------------------------------------- + #ifndef MAINGUIWINDOW_H #define MAINGUIWINDOW_H diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/marker.h b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/marker.h index f71a521b..1a7a4ae0 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/marker.h +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/marker.h @@ -1,18 +1,34 @@ -// Teacher's GUI marker object, to represent unlabeled markers. -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Teacher's GUI marker object, to represent unlabeled markers. +// +// ---------------------------------------------------------------------------------- + #ifndef MARKER_H #define MARKER_H diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/myGraphicsRectItem.h b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/myGraphicsRectItem.h index b41ffb17..a5358e2b 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/myGraphicsRectItem.h +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/myGraphicsRectItem.h @@ -1,20 +1,35 @@ -// Abstract class to represent our reimplementation of QGraphicsRectItem. Will be the base -// for table and crazyflie zone. -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Abstract class to represent our reimplementation of QGraphicsRectItem. Will be the base +// for table and crazyflie zone. +// +// ---------------------------------------------------------------------------------- + #ifndef MYGRAPHICSRECTITEM_H #define MYGRAPHICSRECTITEM_H diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/myGraphicsScene.h b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/myGraphicsScene.h index 091ac65d..91ea913c 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/myGraphicsScene.h +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/myGraphicsScene.h @@ -1,19 +1,34 @@ -// Our reimplementation of QGraphicsScene -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Our reimplementation of QGraphicsScene +// +// ---------------------------------------------------------------------------------- + #ifndef MYGRAPHICSSCENE_H #define MYGRAPHICSSCENE_H diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/myGraphicsView.h b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/myGraphicsView.h index 1ddcc936..154dfbef 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/myGraphicsView.h +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/myGraphicsView.h @@ -1,19 +1,34 @@ -// Our reimplementation of QGraphicsView -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Our reimplementation of QGraphicsView +// +// ---------------------------------------------------------------------------------- + #ifndef MYGRAPHICSVIEW_H #define MYGRAPHICSVIEW_H diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/rosNodeThread.h b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/rosNodeThread.h index b54cd14b..699a5b1f 100644 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/rosNodeThread.h +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/rosNodeThread.h @@ -1,19 +1,34 @@ -// Creates a thread that runs the ros node. -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Creates a thread that runs the ros node. +// +// ---------------------------------------------------------------------------------- + #ifndef ___ROSNODETHREAD_H___ #define ___ROSNODETHREAD_H___ diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/tablePiece.h b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/tablePiece.h index 64a2c197..f97d5eca 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/tablePiece.h +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/include/tablePiece.h @@ -1,19 +1,34 @@ -// Table piece, rectangle that serves as a representation of the real table -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Table piece, rectangle that serves as a representation of the real table +// +// ---------------------------------------------------------------------------------- + #ifndef TABLEPIECE_H #define TABLEPIECE_H diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/CFLinker.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/CFLinker.cpp index 97369d3e..9ee8fdbb 100644 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/CFLinker.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/CFLinker.cpp @@ -1,19 +1,34 @@ -// Links the crazyflies with the student ids and with the crazyflie zones -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Links the crazyflies with the student ids and with the crazyflie zones +// +// ---------------------------------------------------------------------------------- + #include "CFLinker.h" diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/centerMarker.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/centerMarker.cpp index 70895607..73a82f9a 100644 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/centerMarker.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/centerMarker.cpp @@ -1,19 +1,34 @@ -// Marker for the center of the Crazyflie Zone -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Marker for the center of the Crazyflie Zone +// +// ---------------------------------------------------------------------------------- + #include "centerMarker.h" diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp index 8b1529ab..a4d82323 100644 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp @@ -1,19 +1,34 @@ -// Look up table that connects the crazyflie names with their respective radio addresses -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Look up table that connects the crazyflie names with their respective radio addresses +// +// ---------------------------------------------------------------------------------- + #include "channelLUT.h" diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/cornergrabber.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/cornergrabber.cpp index 4b9577a0..8cd8acb3 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/cornergrabber.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/cornergrabber.cpp @@ -1,19 +1,34 @@ -// Cornergrabber that allows to dynamically change the size of tables and crazyflie zones -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Cornergrabber that allows to dynamically change the size of tables and crazyflie zones +// +// ---------------------------------------------------------------------------------- + #include "cornergrabber.h" diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFly.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFly.cpp index 81386533..d83ccd4e 100644 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFly.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFly.cpp @@ -1,19 +1,34 @@ -// Crazyflie object, representation of a Crazyflie in the scene -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Crazyflie object, representation of a Crazyflie in the scene +// +// ---------------------------------------------------------------------------------- + #include "crazyFly.h" diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFlyZone.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFlyZone.cpp index 2e2a0705..4a50b614 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFlyZone.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFlyZone.cpp @@ -1,19 +1,34 @@ -// Rectangular zone that we will be able to link to a crazyflie -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Rectangular zone that we will be able to link to a crazyflie +// +// ---------------------------------------------------------------------------------- + #include "crazyFlyZone.h" #include "globalDefinitions.h" diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFlyZoneTab.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFlyZoneTab.cpp index 63677e3f..72ffe02a 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFlyZoneTab.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/crazyFlyZoneTab.cpp @@ -1,19 +1,34 @@ -// Tab that is created when we create a crazyflie zone -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Tab that is created when we create a crazyflie zone +// +// ---------------------------------------------------------------------------------- + #include "crazyFlyZoneTab.h" diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/main.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/main.cpp index 1b8181a7..ed3847f3 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/main.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/main.cpp @@ -1,19 +1,34 @@ -// Main file of the project Teacher's GUI. -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Main file of the project Teacher's GUI. +// +// ---------------------------------------------------------------------------------- + #include "mainguiwindow.h" #include "ui_mainguiwindow.h" diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp index 7691e350..c5118668 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp @@ -1,18 +1,34 @@ -// Teacher's GUI main window header. -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Teacher's GUI main window header. +// +// ---------------------------------------------------------------------------------- + #include "mainguiwindow.h" #include "ui_mainguiwindow.h" diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/marker.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/marker.cpp index fbf24787..118165ed 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/marker.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/marker.cpp @@ -1,18 +1,34 @@ -// Teacher's GUI marker object, to represent unlabeled markers. -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Teacher's GUI marker object, to represent unlabeled markers. +// +// ---------------------------------------------------------------------------------- + #include "marker.h" diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsRectItem.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsRectItem.cpp index f73d903f..d328de46 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsRectItem.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsRectItem.cpp @@ -1,20 +1,35 @@ -// Abstract class to represent our reimplementation of QGraphicsRectItem. Will be the base -// for table and crazyflie zone. -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Abstract class to represent our reimplementation of QGraphicsRectItem. Will be the base +// for table and crazyflie zone. +// +// ---------------------------------------------------------------------------------- + #include "myGraphicsRectItem.h" diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsScene.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsScene.cpp index 814d927a..33b5d4e7 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsScene.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsScene.cpp @@ -1,19 +1,34 @@ -// Our reimplementation of QGraphicsScene -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Our reimplementation of QGraphicsScene +// +// ---------------------------------------------------------------------------------- + #include "myGraphicsScene.h" #include "globalDefinitions.h" diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsView.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsView.cpp index 85be20ab..1673bc09 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsView.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/myGraphicsView.cpp @@ -1,19 +1,34 @@ -// Our reimplementation of QGraphicsView -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Our reimplementation of QGraphicsView +// +// ---------------------------------------------------------------------------------- + #include "myGraphicsView.h" diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/rosNodeThread.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/rosNodeThread.cpp index 65f301db..d417ffc9 100644 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/rosNodeThread.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/rosNodeThread.cpp @@ -1,19 +1,34 @@ -// Creates a thread that runs the ros node. -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Creates a thread that runs the ros node. +// +// ---------------------------------------------------------------------------------- + #include "rosNodeThread.h" diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/tablePiece.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/tablePiece.cpp index 25bd917d..1b5893dd 100755 --- a/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/tablePiece.cpp +++ b/pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/tablePiece.cpp @@ -1,19 +1,34 @@ -// Table piece, rectangle that serves as a representation of the real table -// -// Copyright (C) 2017 Angel Romero +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Table piece, rectangle that serves as a representation of the real table +// +// ---------------------------------------------------------------------------------- + #include "tablePiece.h" diff --git a/pps_ws/src/d_fall_pps/crazyradio/CrazyRadio.py b/pps_ws/src/d_fall_pps/crazyradio/CrazyRadio.py index 69dd2b6e..e68a72fd 100755 --- a/pps_ws/src/d_fall_pps/crazyradio/CrazyRadio.py +++ b/pps_ws/src/d_fall_pps/crazyradio/CrazyRadio.py @@ -1,21 +1,37 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Alternate controller that is expected to work. -# Copyright (C) 2017 Angel Romero, Cyrill Burgener, Marco Mueller, Philipp Friedli +# Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero, Cyrill Burgener, Marco Mueller, Philipp Friedli +# +# This file is part of D-FaLL-System. +# +# D-FaLL-System is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# D-FaLL-System is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +# +# +# ---------------------------------------------------------------------------------- +# DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +# D D F aaa L L S Y Y S T E MM MM +# D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +# D D F a aa L L S Y S T E M M +# DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +# +# +# DESCRIPTION: +# The service that manages the context of the student groups. +# +# ---------------------------------------------------------------------------------- -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. import roslib; roslib.load_manifest('d_fall_pps') import rospy diff --git a/pps_ws/src/d_fall_pps/include/CentralManagerService.h b/pps_ws/src/d_fall_pps/include/CentralManagerService.h index 3f8ac121..7f6414c1 100644 --- a/pps_ws/src/d_fall_pps/include/CentralManagerService.h +++ b/pps_ws/src/d_fall_pps/include/CentralManagerService.h @@ -1,3 +1,35 @@ +// Copyright (C) 2017, ETH Zurich, D-ITET, Cyrill Burgener, Marco Mueller, Philipp Friedli +// +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// D-FaLL-System is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Header for the service that manages the context of the student groups. +// +// ---------------------------------------------------------------------------------- + + //for field command in CMCommand #define CMD_SAVE 1 #define CMD_RELOAD 2 diff --git a/pps_ws/src/d_fall_pps/include/CrazyflieIO.h b/pps_ws/src/d_fall_pps/include/CrazyflieIO.h index d736fe52..fa4e2573 100644 --- a/pps_ws/src/d_fall_pps/include/CrazyflieIO.h +++ b/pps_ws/src/d_fall_pps/include/CrazyflieIO.h @@ -1,3 +1,35 @@ +// Copyright (C) 2017, ETH Zurich, D-ITET, Cyrill Burgener, Marco Mueller, Philipp Friedli +// +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// D-FaLL-System is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Header for the Input/Output stream from the Crazyflie. +// +// ---------------------------------------------------------------------------------- + + #include "d_fall_pps/CrazyflieDB.h" namespace d_fall_pps { diff --git a/pps_ws/src/d_fall_pps/src/CentralManagerService.cpp b/pps_ws/src/d_fall_pps/src/CentralManagerService.cpp index c1e2c058..9fd5332f 100755 --- a/pps_ws/src/d_fall_pps/src/CentralManagerService.cpp +++ b/pps_ws/src/d_fall_pps/src/CentralManagerService.cpp @@ -1,18 +1,34 @@ -// The service that manages the context of the student groups. -// Copyright (C) 2017 Cyrill Burgener, Marco Mueller, Philipp Friedli +// Copyright (C) 2017, ETH Zurich, D-ITET, Cyrill Burgener, Marco Mueller, Philipp Friedli // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// The service that manages the context of the student groups. +// +// ---------------------------------------------------------------------------------- + #include <stdlib.h> #include <ros/ros.h> diff --git a/pps_ws/src/d_fall_pps/src/CircleControllerService.cpp b/pps_ws/src/d_fall_pps/src/CircleControllerService.cpp index 6a3fe811..0f6c387a 100755 --- a/pps_ws/src/d_fall_pps/src/CircleControllerService.cpp +++ b/pps_ws/src/d_fall_pps/src/CircleControllerService.cpp @@ -1,18 +1,34 @@ -// Alternate controller that is expected to work. -// Copyright (C) 2017 Cyrill Burgener, Marco Mueller, Philipp Friedli +// Copyright (C) 2017, ETH Zurich, D-ITET, Cyrill Burgener, Marco Mueller, Philipp Friedli // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Alternate controller that flies the quadcopter in a circle. +// +// ---------------------------------------------------------------------------------- + #include <math.h> #include <stdlib.h> diff --git a/pps_ws/src/d_fall_pps/src/CrazyflieIO.cpp b/pps_ws/src/d_fall_pps/src/CrazyflieIO.cpp index 6e493015..8ef32d75 100644 --- a/pps_ws/src/d_fall_pps/src/CrazyflieIO.cpp +++ b/pps_ws/src/d_fall_pps/src/CrazyflieIO.cpp @@ -1,18 +1,34 @@ -// Alternate controller that is expected to work. -// Copyright (C) 2017 Cyrill Burgener, Marco Mueller, Philipp Friedli +// Copyright (C) 2017, ETH Zurich, D-ITET, Cyrill Burgener, Marco Mueller, Philipp Friedli // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// This manages the Input/Output stream from the Crazyflie +// +// ---------------------------------------------------------------------------------- + #include "CrazyflieIO.h" #include <stdlib.h> diff --git a/pps_ws/src/d_fall_pps/src/CustomControllerService.cpp b/pps_ws/src/d_fall_pps/src/CustomControllerService.cpp index c5124855..b7806699 100644 --- a/pps_ws/src/d_fall_pps/src/CustomControllerService.cpp +++ b/pps_ws/src/d_fall_pps/src/CustomControllerService.cpp @@ -1,18 +1,33 @@ -// Place for students to implement their controller -// Copyright (C) 2017 Cyrill Burgener, Marco Mueller, Philipp Friedli +// Copyright (C) 2017, ETH Zurich, D-ITET, Cyrill Burgener, Marco Mueller, Philipp Friedli // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Place for students to implement their controller +// +// ---------------------------------------------------------------------------------- //some useful libraries diff --git a/pps_ws/src/d_fall_pps/src/FollowCrazyflieService.cpp b/pps_ws/src/d_fall_pps/src/FollowCrazyflieService.cpp index 1a909405..1b36613f 100755 --- a/pps_ws/src/d_fall_pps/src/FollowCrazyflieService.cpp +++ b/pps_ws/src/d_fall_pps/src/FollowCrazyflieService.cpp @@ -1,18 +1,34 @@ -// Alternate controller that is expected to work. -// Copyright (C) 2017 Cyrill Burgener, Marco Mueller, Philipp Friedli +// Copyright (C) 2017, ETH Zurich, D-ITET, Cyrill Burgener, Marco Mueller, Philipp Friedli // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Controller that follows the position of another Crazyflie +// +// ---------------------------------------------------------------------------------- + #include <math.h> #include <stdlib.h> diff --git a/pps_ws/src/d_fall_pps/src/FollowN_1Service.cpp b/pps_ws/src/d_fall_pps/src/FollowN_1Service.cpp index 2e4f78e3..84dec28c 100644 --- a/pps_ws/src/d_fall_pps/src/FollowN_1Service.cpp +++ b/pps_ws/src/d_fall_pps/src/FollowN_1Service.cpp @@ -1,18 +1,34 @@ -// Alternate controller that is expected to work. -// Copyright (C) 2017 Angel Romero, Cyrill Burgener, Marco Mueller, Philipp Friedli +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero, Cyrill Burgener, Marco Mueller, Philipp Friedli // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// Controller that follows the Crazyflie with ID N-1 +// +// ---------------------------------------------------------------------------------- + #include <math.h> #include <stdlib.h> diff --git a/pps_ws/src/d_fall_pps/src/PPSClient.cpp b/pps_ws/src/d_fall_pps/src/PPSClient.cpp index ae0771ed..0bdf9458 100755 --- a/pps_ws/src/d_fall_pps/src/PPSClient.cpp +++ b/pps_ws/src/d_fall_pps/src/PPSClient.cpp @@ -1,18 +1,34 @@ -// ROS node that manages the student's setup. -// Copyright (C) 2017 Cyrill Burgener, Marco Mueller, Philipp Friedli +// Copyright (C) 2017, ETH Zurich, D-ITET, Angel Romero, Cyrill Burgener, Marco Mueller, Philipp Friedli // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// ROS node that manages the student's setup. +// +// ---------------------------------------------------------------------------------- + #include "ros/ros.h" #include <stdlib.h> diff --git a/pps_ws/src/d_fall_pps/src/SafeControllerService.cpp b/pps_ws/src/d_fall_pps/src/SafeControllerService.cpp index de0ce9c4..b2b97da3 100755 --- a/pps_ws/src/d_fall_pps/src/SafeControllerService.cpp +++ b/pps_ws/src/d_fall_pps/src/SafeControllerService.cpp @@ -1,18 +1,34 @@ -// Alternate controller that is expected to work. -// Copyright (C) 2017 Cyrill Burgener, Marco Mueller, Philipp Friedli +// Copyright (C) 2017, ETH Zurich, D-ITET, Cyrill Burgener, Marco Mueller, Philipp Friedli // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// The fall-back controller that keeps the Crazyflie safe +// +// ---------------------------------------------------------------------------------- + #include <math.h> #include <stdlib.h> diff --git a/pps_ws/src/d_fall_pps/src/ViconDataPublisher.cpp b/pps_ws/src/d_fall_pps/src/ViconDataPublisher.cpp index b9b3424d..2c9170a6 100755 --- a/pps_ws/src/d_fall_pps/src/ViconDataPublisher.cpp +++ b/pps_ws/src/d_fall_pps/src/ViconDataPublisher.cpp @@ -1,18 +1,34 @@ -// ROS node that publishes the data from the Vicon system -// Copyright (C) 2017 Dusan Zikovic, Cyrill Burgener, Marco Mueller, Philipp Friedli +// Copyright (C) 2017, ETH Zurich, D-ITET, Dusan Zikovic, Cyrill Burgener, Marco Mueller, Philipp Friedli // -// This program is free software: you can redistribute it and/or modify +// This file is part of D-FaLL-System. +// +// D-FaLL-System is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, +// +// D-FaLL-System is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// along with D-FaLL-System. If not, see <http://www.gnu.org/licenses/>. +// +// +// ---------------------------------------------------------------------------------- +// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M +// D D F aaa L L S Y Y S T E MM MM +// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M +// D D F a aa L L S Y S T E M M +// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M +// +// +// DESCRIPTION: +// ROS node that publishes the data from the Vicon system +// +// ---------------------------------------------------------------------------------- + #include <string.h> #include "DataStreamClient.h" -- GitLab