Merge branch 'master' of git.ece.iastate.edu:danc/MicroCART_17-18
Conflicts: quad/src/quad_app/callbacks.c
No related branches found
No related tags found
Showing
- .gitignore 3 additions, 1 deletion.gitignore
- controls/model/loggingAnalysis/logAnalysis.m 38 additions, 10 deletionscontrols/model/loggingAnalysis/logAnalysis.m
- controls/model/loggingAnalysis/logFiles/Fri_Mar_24_18-08-27_2017.txt 7618 additions, 0 deletions...del/loggingAnalysis/logFiles/Fri_Mar_24_18-08-27_2017.txt
- controls/model/modelParameters.m 50 additions, 6 deletionscontrols/model/modelParameters.m
- controls/model/test_model.slx 0 additions, 0 deletionscontrols/model/test_model.slx
- groundStation/Makefile 5 additions, 2 deletionsgroundStation/Makefile
- groundStation/gui/MicroCART/MicroCART.pro 28 additions, 0 deletionsgroundStation/gui/MicroCART/MicroCART.pro
- groundStation/gui/MicroCART/MicroCART.pro.user 267 additions, 0 deletionsgroundStation/gui/MicroCART/MicroCART.pro.user
- groundStation/gui/MicroCART/controlworker.cpp 6 additions, 0 deletionsgroundStation/gui/MicroCART/controlworker.cpp
- groundStation/gui/MicroCART/controlworker.h 23 additions, 0 deletionsgroundStation/gui/MicroCART/controlworker.h
- groundStation/gui/MicroCART/main.cpp 11 additions, 0 deletionsgroundStation/gui/MicroCART/main.cpp
- groundStation/gui/MicroCART/mainwindow.cpp 119 additions, 0 deletionsgroundStation/gui/MicroCART/mainwindow.cpp
- groundStation/gui/MicroCART/mainwindow.h 42 additions, 0 deletionsgroundStation/gui/MicroCART/mainwindow.h
- groundStation/gui/MicroCART/mainwindow.ui 413 additions, 0 deletionsgroundStation/gui/MicroCART/mainwindow.ui
- groundStation/gui/MicroCART/trackerworker.cpp 37 additions, 0 deletionsgroundStation/gui/MicroCART/trackerworker.cpp
- groundStation/gui/MicroCART/trackerworker.h 28 additions, 0 deletionsgroundStation/gui/MicroCART/trackerworker.h
- groundStation/gui/MicroCART/wrappers.c 68 additions, 0 deletionsgroundStation/gui/MicroCART/wrappers.c
- groundStation/gui/MicroCART/wrappers.h 19 additions, 0 deletionsgroundStation/gui/MicroCART/wrappers.h
- groundStation/src/backend/backend.c 4 additions, 0 deletionsgroundStation/src/backend/backend.c
- groundStation/src/backend/packet.c 2 additions, 2 deletionsgroundStation/src/backend/packet.c
Loading
Please register or sign in to comment