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

54862713

Unverified Commit 54862713 authored 8 years ago by Jake Drahos

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/commands-dev' into commands-dev-backend

parents 5683f8ac 5b1b7aa7

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

groundStation/src/backend/commands.c 3 additions, 0 deletions

groundStation/src/backend/commands.c
groundStation/src/backend/commands.h 5 additions, 0 deletions

groundStation/src/backend/commands.h
quad/sw/modular_quad_pid/src/callbacks.c 88 additions, 209 deletions

quad/sw/modular_quad_pid/src/callbacks.c
quad/sw/modular_quad_pid/src/callbacks.h 4 additions, 3 deletions

quad/sw/modular_quad_pid/src/callbacks.h
quad/sw/modular_quad_pid/src/cb_default.h 1 addition, 0 deletions

quad/sw/modular_quad_pid/src/cb_default.h
quad/sw/modular_quad_pid/src/control_algorithm.c 82 additions, 82 deletions

quad/sw/modular_quad_pid/src/control_algorithm.c
quad/sw/modular_quad_pid/src/type_def.h 10 additions, 14 deletions

quad/sw/modular_quad_pid/src/type_def.h

with 193 additions and 308 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