From 9f5b82ed912193af5d66aa19f19b6acf9a618f0f Mon Sep 17 00:00:00 2001 From: rusEfi Date: Thu, 11 Feb 2016 20:20:28 -0500 Subject: [PATCH] auto-sync --- firmware/Makefile | 2 -- firmware/svnversion.h | 4 ++-- firmware/util/console_util.mk | 2 -- firmware/util/util.mk | 1 + win32_functional_tests/Makefile | 2 -- 5 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 firmware/util/console_util.mk diff --git a/firmware/Makefile b/firmware/Makefile index f6435bdc83..6b72d98c32 100644 --- 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) \ diff --git a/firmware/svnversion.h b/firmware/svnversion.h index 73b7398241..1361a537bb 100644 --- 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 diff --git a/firmware/util/console_util.mk b/firmware/util/console_util.mk deleted file mode 100644 index 9d01aa66da..0000000000 --- a/firmware/util/console_util.mk +++ /dev/null @@ -1,2 +0,0 @@ - -CONSOLEUTILSRC = $(PROJECT_DIR)/rfiutil.c \ No newline at end of file diff --git a/firmware/util/util.mk b/firmware/util/util.mk index 7396075209..2ff4b2bdc7 100644 --- 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 diff --git a/win32_functional_tests/Makefile b/win32_functional_tests/Makefile index c4ad5a152b..beadfe8828 100644 --- 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) \