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

891bdf80

Commit 891bdf80 authored 3 years ago by Ryan Hunt

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 837e8438 e228037d

No related branches found

No related tags found

1 merge request!77Groundstation gui rough edits

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

groundStation/gui/MicroCART/crazyflieworker.cpp 7 additions, 4 deletions

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

groundStation/gui/MicroCART/crazyflieworker.h
groundStation/gui/MicroCART/logworker.cpp 4 additions, 16 deletions

groundStation/gui/MicroCART/logworker.cpp
groundStation/gui/MicroCART/logworker.h 1 addition, 2 deletions

groundStation/gui/MicroCART/logworker.h
groundStation/gui/MicroCART/mainwindow.cpp 5 additions, 0 deletions

groundStation/gui/MicroCART/mainwindow.cpp
groundStation/gui/MicroCART/mainwindow.h 3 additions, 0 deletions

groundStation/gui/MicroCART/mainwindow.h

with 21 additions and 22 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