From b973c11a951d10c12249dec4e1eb44c04bbd9446 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Fri, 10 Jun 2016 15:01:47 -0400 Subject: [PATCH] auto-sync --- firmware/Makefile | 5 ++++- firmware/hw_layer/mass_storage/mass_storage.mk | 2 ++ firmware/svnversion.h | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 firmware/hw_layer/mass_storage/mass_storage.mk diff --git a/firmware/Makefile b/firmware/Makefile index fb3e71f91f..7595197656 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -99,7 +99,8 @@ include $(CHIBIOS)/os/kernel/kernel.mk include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk include console/binary/tunerstudio.mk include ext/ext.mk -include hw_layer/hw_layer.mk +include $(PROJECT_DIR)/hw_layer/hw_layer.mk +include $(PROJECT_DIR)/hw_layer/mass_storage/mass_storage.mk include development/development.mk include controllers/controllers.mk @@ -125,6 +126,7 @@ CSRC = $(PORTSRC) \ chibios/os/various/chprintf.c \ chibios/os/various/memstreams.c \ chibios/os/various/chrtclib.c \ + ${HW_MASS_STORAGE_SRC_C} \ $(UTILSRC) \ $(ENGINES_SRC) \ $(CONSOLESRC) \ @@ -201,6 +203,7 @@ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ console \ console/binary \ hw_layer \ + $(PROJECT_DIR)/mass_storage \ hw_layer/serial_over_usb \ hw_layer/algo \ hw_layer/lcd \ diff --git a/firmware/hw_layer/mass_storage/mass_storage.mk b/firmware/hw_layer/mass_storage/mass_storage.mk new file mode 100644 index 0000000000..f03524cc56 --- /dev/null +++ b/firmware/hw_layer/mass_storage/mass_storage.mk @@ -0,0 +1,2 @@ + +HW_MASS_STORAGE_SRC_C = $(PROJECT_DIR)/hw_layer/mass_storage/usb_msd.c \ No newline at end of file diff --git a/firmware/svnversion.h b/firmware/svnversion.h index 7c4943ccf4..576ac0ec31 100644 --- a/firmware/svnversion.h +++ b/firmware/svnversion.h @@ -1,5 +1,5 @@ // This file was generated by Version2Header -// Wed Jun 01 19:04:48 EDT 2016 +// Fri Jun 10 13:15:47 EDT 2016 #ifndef VCS_VERSION -#define VCS_VERSION "9961" +#define VCS_VERSION "9984" #endif