auto-sync

2016-02-11 20:20:28 -05:00 · 2016-02-11 20:20:28 -05:00 · 9f5b82ed91
parent 4e08ac5618
commit 9f5b82ed91
5 changed files with 3 additions and 8 deletions
--- a/firmware/Makefile
+++ b/firmware/Makefile
@ -112,7 +112,6 @@ include $(PROJECT_DIR)/controllers/sensors/sensors.mk
 include $(PROJECT_DIR)/controllers/system/system.mk
 include $(PROJECT_DIR)/controllers/trigger/trigger.mk
 include $(PROJECT_DIR)/console/console.mk
-include $(PROJECT_DIR)/util/console_util.mk


 # Define linker script file here
@ -129,7 +128,6 @@ CSRC = $(PORTSRC) \
 	$(UTILSRC) \
 	$(ENGINES_SRC) \
 	$(CONSOLESRC) \
-	$(CONSOLEUTILSRC) \
 	$(HALSRC) \
 	$(DEV_SRC) \
 	$(HW_LAYER_EMS) \
--- a/firmware/svnversion.h
+++ b/firmware/svnversion.h
@ -1,5 +1,5 @@
 // This file was generated by Version2Header
-// Thu Feb 11 14:16:47 EST 2016
+// Thu Feb 11 19:42:49 EST 2016
 #ifndef VCS_VERSION
-#define VCS_VERSION "9535"
+#define VCS_VERSION "9550"
 #endif
--- a/firmware/util/console_util.mk
+++ b/firmware/util/console_util.mk
@ -1,2 +0,0 @@
-
-CONSOLEUTILSRC = $(PROJECT_DIR)/rfiutil.c
--- a/firmware/util/util.mk
+++ b/firmware/util/util.mk
@ -1,5 +1,6 @@

 UTIL_TEST_SRC = $(PROJECT_DIR)/util/crc.c \
+	$(PROJECT_DIR)/rfiutil.c \
 	$(PROJECT_DIR)/util/data_buffer.c \
 	$(PROJECT_DIR)/util/histogram.c

--- a/win32_functional_tests/Makefile
+++ b/win32_functional_tests/Makefile
@ -80,7 +80,6 @@ include $(PROJECT_DIR)/controllers/trigger/trigger.mk
 include $(PROJECT_DIR)/controllers/system/system.mk
 include $(PROJECT_DIR)/console/console.mk
 include $(PROJECT_DIR)/console/binary/tunerstudio.mk
-include $(PROJECT_DIR)/util/console_util.mk
 include $(PROJECT_DIR)/development/development.mk

 include $(CHIBIOS)/boards/simulator/board.mk
@ -103,7 +102,6 @@ CSRC =	${PORTSRC} \
 	$(TRIGGER_SRC) \
 	$(SYSTEMSRC) \
 	$(CONSOLESRC) \
-	$(CONSOLEUTILSRC) \
 	$(CONTROLLERS_ALGO_SRC) \
 	$(CONTROLLERS_CORE_SRC) \
 	$(CONTROLLERS_MATH_SRC) \