quad: separate commands files into their own library

groundStation/Makefile

@@ -7,7 +7,7 @@ CFLAGS= -Wall -pedantic -Wextra -Werror -std=gnu99 -g -Wno-unused-parameter -Wno
 CXXFLAGS= -Wall -pedantic -Wextra -Werror -Wno-reorder -Wno-unused-variable -std=c++0x -g
 INCLUDES = $(foreach dir, $(INCDIR), -I$(dir))
 INCDIR=../quad/inc src/vrpn src/vrpn/quat src/vrpn/build $(BESRCDIR) $(CLISRCDIR) $(FESRCDIR)
-LIBS= -lpthread -lbluetooth -lvrpn -lquat -Lsrc/vrpn/build -Lsrc/vrpn/build/quat -lcomputation_graph -L../quad/lib -lquad_app
+LIBS= -lpthread -lbluetooth -lvrpn -lquat -Lsrc/vrpn/build -Lsrc/vrpn/build/quat -lcomputation_graph -L../quad/lib -lcommands
 OBJDIR=obj
 
 # Common Objects

quad/Makefile

@@ -13,6 +13,7 @@ libs:
 	$(MAKE) -C src/test
 	$(MAKE) -C src/queue
 	$(MAKE) -C src/computation_graph
+	$(MAKE) -C src/commands
 	$(MAKE) -C src/quad_app
 
 zybo:

quad/src/commands/Makefile

+TOP=../..
+
+NAME = commands
+REQLIBS = -ltest
+
+include $(TOP)/library.mk

quad/src/quad_app/cb_default.h → quad/src/commands/cb_default.h

 #include "commands.h"
-#include "type_def.h"
 
 /* The cb_default used on the groundStation. This file MUST NOT BE INCLUDED
  * by anything except for commands.c */
 
 /* cb_default used by portable commands.c */
-int cb_default(modular_structs_t *structs)
+int cb_default(struct modular_structs *structs)
 {
 	    return 0;
 }

quad/src/quad_app/commands.h → quad/src/commands/commands.h

@@ -5,8 +5,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "callbacks.h"
-
 #define MAX_CMD_TEXT_LENGTH 100
 
 enum Message{
@@ -58,6 +56,10 @@ enum MessageTypeID{
 	MAX_TYPE_ID           // 20 - Just used to keep track of the size. Must remain at the end
 };
 
+struct modular_structs;
+struct metadata;
+typedef int (command_cb)(struct modular_structs *, struct metadata *, unsigned char *, unsigned short);
+
 /*
  * Message type struct used to keep track of the callback function
  * pointers located in commands.c

quad/src/quad_app/Makefile

 TOP=../..
 
 NAME = quad_app
-REQLIBS = -ltest -lcomputation_graph -lm -lqueue
+REQLIBS = -ltest -lcomputation_graph -lm -lqueue -lcommands
 
 include $(TOP)/library.mk

quad/src/quad_app/callbacks.h

@@ -4,8 +4,6 @@
 /* Grab some stupid stuff from legacy code */
 struct modular_structs;
 struct metadata;
-
-/* Make commands.c happy */
 typedef int (command_cb)(struct modular_structs *, struct metadata *, unsigned char *, unsigned short);
 
 #endif