Merge remote-tracking branch 'origin/groundStation-dev-comp_graph-commands' into gui-dev

709342d5 · Jake Drahos · a5faab83 · cdbd0fd5 · 709342d5 · 709342d5
Unverified Commit 709342d5 authored 8 years ago by Jake Drahos
--- a/quad/src/quad_app/node_mixer.c
+++ b/quad/src/quad_app/node_mixer.c
--- a/quad/src/quad_app/node_mixer.h
+++ b/quad/src/quad_app/node_mixer.h
--- a/quad/src/computation_graph/node_mult.c
+++ b/quad/src/computation_graph/node_mult.c
--- a/quad/src/computation_graph/node_mult.h
+++ b/quad/src/computation_graph/node_mult.h
--- a/quad/src/quad_app/node_pid.c
+++ b/quad/src/quad_app/node_pid.c
--- a/quad/src/quad_app/node_pid.h
+++ b/quad/src/quad_app/node_pid.h
--- a/quad/src/computation_graph/node_pow.c
+++ b/quad/src/computation_graph/node_pow.c
--- a/quad/src/computation_graph/node_pow.h
+++ b/quad/src/computation_graph/node_pow.h
--- a/quad/src/quad_app/Makefile
+++ b/quad/src/quad_app/Makefile
--- a/quad/src/quad_app/callbacks.c
+++ b/quad/src/quad_app/callbacks.c
--- a/quad/src/quad_app/callbacks.h
+++ b/quad/src/quad_app/callbacks.h
--- a/quad/src/quad_app/commands.c
+++ b/quad/src/quad_app/commands.c
--- a/quad/src/quad_app/commands.h
+++ b/quad/src/quad_app/commands.h
--- a/quad/src/quad_app/communication.c
+++ b/quad/src/quad_app/communication.c
--- a/quad/src/quad_app/control_algorithm.c
+++ b/quad/src/quad_app/control_algorithm.c
--- a/quad/src/quad_app/log_data.c
+++ b/quad/src/quad_app/log_data.c
--- a/quad/src/quad_app/util.c
+++ b/quad/src/quad_app/util.c
--- a/quad/src/quad_app/util.h
+++ b/quad/src/quad_app/util.h
--- a/quad/src/virt_quad/Makefile
+++ b/quad/src/virt_quad/Makefile
--- a/quad/src/virt_quad/hw_impl_unix.c
+++ b/quad/src/virt_quad/hw_impl_unix.c