Commits · a474ae6f4449185f0a3b83ca3ae3b10e9171ad5f · authierj / dfall-system

12 May, 2017 19 commits
- y · a474ae6f
  bucyril authored May 12, 2017
  
  a474ae6f
- fixed · 3e2908c4
  https://roangel@gitlab.ethz.ch authored May 12, 2017
  
  3e2908c4
- Merge branch 'pps_project' of https://gitlab.ethz.ch/D-FaLL/D-FaLL-System into pps_project · cc5df7ff
  https://roangel@gitlab.ethz.ch authored May 12, 2017
  
  cc5df7ff
- my hands are typing words · 3c30381d
  https://roangel@gitlab.ethz.ch authored May 12, 2017
  
  3c30381d
- weird conflict? · c50ce8f3
  roangel authored May 12, 2017
  
  c50ce8f3
- Changed GUI side of messages. Compiles and works good now · f1f50837
  roangel authored May 12, 2017
  
  f1f50837
- Merge branch 'pps_project' of https://gitlab.ethz.ch/D-FaLL/D-FaLL-System into pps_project · ff054b34
  https://roangel@gitlab.ethz.ch authored May 12, 2017
  
  ff054b34
- implemented services of CentralManagerService · 36f77cf7
  https://roangel@gitlab.ethz.ch authored May 12, 2017
  
  36f77cf7
- added orig and bag files to .gitignore, merged PPSClient · 3ed5bfb7
  muelmarc authored May 12, 2017
  
  3ed5bfb7
- rosbag recording to file · 46b195a9
  muelmarc authored May 12, 2017
  
  46b195a9
- Merge branch 'plot_crazyflies_branch' into pps_project · 59fa7b8f
  roangel authored May 12, 2017
  
  59fa7b8f
- Prepared to merge branch, crazyfly support added · 288cd22a
  roangel authored May 12, 2017
  
  288cd22a
- CMakeLists.txt edited to include crazyfly · 721d79c7
  roangel authored May 12, 2017
  
  721d79c7
- changed ViconDataPublisher and messages as discussed this morning · 8eb7eb0b
  https://roangel@gitlab.ethz.ch authored May 12, 2017
  
  8eb7eb0b
- cleaned merging mess. compiles again. · 2fe0ab3f
  muelmarc authored May 12, 2017
  
  2fe0ab3f
- Added svg Crazyfly class, with coordinate system · b363e54a
  roangel authored May 12, 2017
  
  b363e54a
- repaired CentralManagerService · 39e12c93
  https://roangel@gitlab.ethz.ch authored May 12, 2017
  
  39e12c93
- merged?? · a70aad13
  muelmarc authored May 12, 2017
  
  a70aad13
- updates from yesterday for data recording · d25ade15
  muelmarc authored May 12, 2017
  
  d25ade15
11 May, 2017 14 commits
- Merge branch 'pps_project' of https://gitlab.ethz.ch/D-FaLL/D-FaLL-System into pps_project · 35ebc7a2
  phfriedl authored May 11, 2017
  
  35ebc7a2
- added small comment to CustomControllerService · 516b1b0e
  phfriedl authored May 11, 2017
  
  516b1b0e
- added image to project. Need to adjust size, offset, etc. Need also to... · 551b118b
  roangel authored May 11, 2017
```
added image to project. Need to adjust size, offset, etc. Need also to investigate CMAKE resource adding
```
  551b118b
- Merging angel's branch to pps_project branch · 452612ee
  roangel authored May 11, 2017
  
  452612ee
- Tested with real vicon data. Fixed final detail. Now everything works just good, ready for merging · 2ac4575b
  roangel authored May 11, 2017
  
  2ac4575b
- some changes downstairs with vicon data. It works! · b0e8eca2
  bucyril authored May 11, 2017
  
  b0e8eca2
- added QPointF constructor for marker added · 535f8e67
  roangel authored May 11, 2017
  
  535f8e67
- Angel: Comitting changes that were only locally in laptop before changing to branch · 03745b76
  bucyril authored May 11, 2017
  
  03745b76
- Now, markers we receive by vicon publisher are automatically drawn in screen · 90f246d2
  roangel authored May 11, 2017
  
  90f246d2
- added scripts to enable/disable crazyflie without stopping ROS · f248fd16
  phfriedl authored May 11, 2017
  
  f248fd16
- rosbag included. not working and creating error at startup. rest should... · f4f59b73
  muelmarc authored May 11, 2017
```
rosbag included. not working and creating error at startup. rest should however still run. safetycheck added again ... switches off and terminates ros when area boundaries are left
```
  f4f59b73
- started implementing CentralManagerService · 48f5ab98
  bucyril authored May 11, 2017
  
  48f5ab98
- forgot to add ViconConfig.yaml to commit · 1ead1f62
  bucyril authored May 11, 2017
  
  1ead1f62
- Merge branch 'controller_update' into pps_project · ae2d2710
  phfriedl authored May 11, 2017
```
Finished with controller, therefore we merge
```
  ae2d2710
08 May, 2017 7 commits
- Merge branch 'controller_update' of... · 6e14aaac
  phfriedl authored May 08, 2017
```
Merge branch 'controller_update' of https://gitlab.ethz.ch/D-FaLL/D-FaLL-System into controller_update

This has to be done
```
  6e14aaac
- changes to CMakeList, Crazyflie.launch and CustomControllerService -- all... · 4ebd0bcc
  phfriedl authored May 08, 2017
```
changes to CMakeList, Crazyflie.launch and CustomControllerService -- all concerning the CustomControllerService
```
  4ebd0bcc
- made vicon config · 69c1dfa0
  bucyril authored May 08, 2017
  
  69c1dfa0
- clean up of SafeControllerService - no more INFO_STREAMs · 75ecf43e
  phfriedl authored May 08, 2017
  
  75ecf43e
- removed debug output · 3e137dd5
  bucyril authored May 08, 2017
  
  3e137dd5
- small changes on script · 20c94f0f
  phfriedl authored May 08, 2017
  
  20c94f0f
- Merge branch 'controller_update' of... · 7f45546e
  bucyril authored May 08, 2017
```
Merge branch 'controller_update' of https://gitlab.ethz.ch/D-FaLL/D-FaLL-System into controller_update
```
  7f45546e