Merge branch 'follow_cf_branch' into student_GUI (772eb6d3) · Commits · dfall / dfall-system · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dfall-system
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

Admin message

To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

772eb6d3

Commit 772eb6d3 authored 7 years ago by Angel

Downloads
- Plain Diff

Merge branch 'follow_cf_branch' into student_GUI

parents c2894575 d9a44935

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

pps_ws/src/d_fall_pps/CMakeLists.txt 4 additions, 0 deletions

pps_ws/src/d_fall_pps/CMakeLists.txt
pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp 1 addition, 1 deletion

pps_ws/src/d_fall_pps/GUI_Qt/CrazyFlyGUI/src/channelLUT.cpp
pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp 0 additions, 1 deletion

pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp
pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/studentGUI.pro.user 1 addition, 1 deletion

pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/studentGUI.pro.user
pps_ws/src/d_fall_pps/launch/FollowN_1.launch 28 additions, 0 deletions

pps_ws/src/d_fall_pps/launch/FollowN_1.launch
pps_ws/src/d_fall_pps/param/ClientConfig.yaml 1 addition, 1 deletion

pps_ws/src/d_fall_pps/param/ClientConfig.yaml
pps_ws/src/d_fall_pps/param/Crazyflie.db 2 additions, 3 deletions

pps_ws/src/d_fall_pps/param/Crazyflie.db
pps_ws/src/d_fall_pps/src/FollowN_1Service.cpp 255 additions, 0 deletions

pps_ws/src/d_fall_pps/src/FollowN_1Service.cpp

with 292 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment