Merge remote branch 'origin/master' into new-uart-circ
Conflicts: quad/.gitignore quad/sw/modular_quad_pid/.cproject
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- controls/model/modelParameters.m 31 additions, 21 deletionscontrols/model/modelParameters.m
- controls/model/test_model.slx 0 additions, 0 deletionscontrols/model/test_model.slx
- groundStation/Makefile 1 addition, 1 deletiongroundStation/Makefile
- groundStation/src/backend/callbacks.c 378 additions, 0 deletionsgroundStation/src/backend/callbacks.c
- groundStation/src/backend/callbacks.h 11 additions, 0 deletionsgroundStation/src/backend/callbacks.h
- groundStation/src/backend/cb_default.h 10 additions, 0 deletionsgroundStation/src/backend/cb_default.h
- groundStation/src/backend/commands.c 657 additions, 524 deletionsgroundStation/src/backend/commands.c
- groundStation/src/backend/commands.h 7 additions, 61 deletionsgroundStation/src/backend/commands.h
- groundStation/src/cli/cli.h 7 additions, 2 deletionsgroundStation/src/cli/cli.h
- groundStation/src/cli/cli_getpid.c 70 additions, 21 deletionsgroundStation/src/cli/cli_getpid.c
- groundStation/src/cli/cli_setpid.h 2 additions, 2 deletionsgroundStation/src/cli/cli_setpid.h
- groundStation/src/cli/cli_setsetpoint.c 66 additions, 0 deletionsgroundStation/src/cli/cli_setsetpoint.c
- groundStation/src/cli/cli_setsetpoint.h 8 additions, 0 deletionsgroundStation/src/cli/cli_setsetpoint.h
- groundStation/src/frontend/frontend_getpid.c 21 additions, 3 deletionsgroundStation/src/frontend/frontend_getpid.c
- groundStation/src/frontend/frontend_setpid.h 6 additions, 3 deletionsgroundStation/src/frontend/frontend_setpid.h
- groundStation/src/frontend/frontend_setsetpoint.c 45 additions, 0 deletionsgroundStation/src/frontend/frontend_setsetpoint.c
- groundStation/src/frontend/frontend_setsetpoint.h 20 additions, 0 deletionsgroundStation/src/frontend/frontend_setsetpoint.h
- groundStation/src/frontend/setpoint_common.h 11 additions, 0 deletionsgroundStation/src/frontend/setpoint_common.h
- quad/.gitignore 1 addition, 3 deletionsquad/.gitignore
Loading
Please register or sign in to comment