From 3a4911d8cd3c9780147fa032f2c33a45afd6a0be Mon Sep 17 00:00:00 2001
From: burneykb <burneykb@iastate.edu>
Date: Mon, 23 Jan 2017 19:20:43 -0600
Subject: [PATCH] having compile issues. Looking into them
---
groundStation/src/cli/cli.h | 3 ++-
groundStation/src/cli/cli_setsetpoint.c | 1 -
groundStation/src/cli/cli_setsetpoint.h | 2 +-
groundStation/src/frontend/frontend_setpid.h | 3 +++
groundStation/src/frontend/frontend_setsetpoint.h | 3 +++
5 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/groundStation/src/cli/cli.h b/groundStation/src/cli/cli.h
index 48345bed7..1d0cf6951 100644
--- a/groundStation/src/cli/cli.h
+++ b/groundStation/src/cli/cli.h
@@ -1,11 +1,11 @@
#ifndef __CLI_H
#define __CLI_H
+#include "cli_setsetpoint.h"
#include "cli_monitor.h"
#include "cli_setpid.h"
#include "cli_getpid.h"
#include "cli_getimu.h"
-#include "cli_setsetpoint.h"
enum CommandNameIds{
CMD_MONITOR,
@@ -32,4 +32,5 @@ static char* commandNames[MAX_COMMANDS] = {
"getimu",
"setsetpoint"
};
+
#endif
diff --git a/groundStation/src/cli/cli_setsetpoint.c b/groundStation/src/cli/cli_setsetpoint.c
index 7ec7641d5..85cd86d16 100644
--- a/groundStation/src/cli/cli_setsetpoint.c
+++ b/groundStation/src/cli/cli_setsetpoint.c
@@ -3,7 +3,6 @@
#include <getopt.h>
#include "cli_setsetpoint.h"
-#include "frontend_setsetpoint.h"
int cli_set(struct backend_conn * conn, int argc, char **argv) {
int c;
diff --git a/groundStation/src/cli/cli_setsetpoint.h b/groundStation/src/cli/cli_setsetpoint.h
index 7b5dc371f..8f2657963 100644
--- a/groundStation/src/cli/cli_setsetpoint.h
+++ b/groundStation/src/cli/cli_setsetpoint.h
@@ -5,4 +5,4 @@
int cli_setsetpoint(struct backend_conn * conn, int argc, char ** argv);
-#endif
+#endif /* CLI_SETSETPOINT_H */
diff --git a/groundStation/src/frontend/frontend_setpid.h b/groundStation/src/frontend/frontend_setpid.h
index 5a186ca19..bd53cd453 100644
--- a/groundStation/src/frontend/frontend_setpid.h
+++ b/groundStation/src/frontend/frontend_setpid.h
@@ -12,6 +12,9 @@ int frontend_setpid(
#define SET_P 0x01
#define SET_I 0x02
#define SET_D 0x04
+
+#ifndef SET_ALL
#define SET_ALL (SET_P | SET_I | SET_D)
+#endif /* SET_ALL */
#endif /* FRONTEND_SETPID_H */
\ No newline at end of file
diff --git a/groundStation/src/frontend/frontend_setsetpoint.h b/groundStation/src/frontend/frontend_setsetpoint.h
index 030417b21..03806fdfe 100644
--- a/groundStation/src/frontend/frontend_setsetpoint.h
+++ b/groundStation/src/frontend/frontend_setsetpoint.h
@@ -12,6 +12,9 @@ int frontend_setsetpoint(
#define SET_X 0x01
#define SET_Y 0x02
#define SET_Z 0x04
+
+#ifndef SET_ALL
#define SET_ALL (SET_X | SET_Y | SET_Z)
+#endif /* SET_ALL */
#endif /* FRONTEND_SETSETPOINT_H */
\ No newline at end of file
--
GitLab