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

2b0cbc2b

Commit 2b0cbc2b authored 7 years ago by co3050-12_user

Downloads
- Plain Diff

Merge branch 'master' of https://git.ece.iastate.edu/danc/MicroCART_16-18

parents d7f81687 7d11c675

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

groundStation/gui/MicroCART/MicroCART.pro 0 additions, 2 deletions

groundStation/gui/MicroCART/MicroCART.pro
groundStation/gui/MicroCART/controlworker.cpp 24 additions, 1 deletion

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

groundStation/gui/MicroCART/controlworker.h
groundStation/gui/MicroCART/mainwindow.cpp 147 additions, 46 deletions

groundStation/gui/MicroCART/mainwindow.cpp
groundStation/gui/MicroCART/mainwindow.h 17 additions, 4 deletions

groundStation/gui/MicroCART/mainwindow.h
groundStation/gui/MicroCART/mainwindow.ui 280 additions, 34 deletions

groundStation/gui/MicroCART/mainwindow.ui
groundStation/gui/MicroCART/wrappers.c 0 additions, 68 deletions

groundStation/gui/MicroCART/wrappers.c
groundStation/gui/MicroCART/wrappers.h 0 additions, 19 deletions

groundStation/gui/MicroCART/wrappers.h
groundStation/src/frontend/frontend_output.h 7 additions, 1 deletion

groundStation/src/frontend/frontend_output.h

with 477 additions and 175 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