Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

MicroCART
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

43a8619d

Commit 43a8619d authored 3 years ago by Zach Eisele

Downloads
- Plain Diff

Merge branch 'groundstation-gui-roughEdits' of...

Merge branch 'groundstation-gui-roughEdits' of https://git.ece.iastate.edu/danc/MicroCART into groundstation-gui-roughEdits

parents 23227a2c 27ca0386

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

crazyflie_groundstation/loggingBlocks.txt 4 additions, 4 deletions

crazyflie_groundstation/loggingBlocks.txt
crazyflie_groundstation/src/ccrazyflie/CCrazyflie.cpp 9 additions, 1 deletion

crazyflie_groundstation/src/ccrazyflie/CCrazyflie.cpp
crazyflie_software/crazyflie-firmware-2021.06/src/modules/src/controller_student.c 8 additions, 4 deletions

...lie-firmware-2021.06/src/modules/src/controller_student.c
groundStation/gui/MicroCART/crazyflieworker.cpp 30 additions, 10 deletions

groundStation/gui/MicroCART/crazyflieworker.cpp
groundStation/gui/MicroCART/crazyflieworker.h 2 additions, 0 deletions

groundStation/gui/MicroCART/crazyflieworker.h
groundStation/gui/MicroCART/mainwindow.cpp 9 additions, 5 deletions

groundStation/gui/MicroCART/mainwindow.cpp
groundStation/gui/MicroCART/mainwindow.h 1 addition, 0 deletions

groundStation/gui/MicroCART/mainwindow.h

with 63 additions and 24 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