From 9b2a5d9db69cf17f083605acb9c9b261857a2ef6 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 9 Mar 2015 11:05:04 -0500 Subject: [PATCH] auto-sync --- firmware/.cproject | 16 ++++++++-------- firmware/Makefile | 4 ++-- .../{tunerstudio => binary}/tunerstudio.cpp | 0 .../{tunerstudio => binary}/tunerstudio.h | 0 firmware/console/binary/tunerstudio.mk | 3 +++ .../tunerstudio_configuration.h | 0 .../{tunerstudio => binary}/tunerstudio_io.cpp | 0 .../{tunerstudio => binary}/tunerstudio_io.h | 0 firmware/console/tunerstudio/tunerstudio.mk | 3 --- firmware/svnversion.h | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) rename firmware/console/{tunerstudio => binary}/tunerstudio.cpp (100%) rename firmware/console/{tunerstudio => binary}/tunerstudio.h (100%) create mode 100644 firmware/console/binary/tunerstudio.mk rename firmware/console/{tunerstudio => binary}/tunerstudio_configuration.h (100%) rename firmware/console/{tunerstudio => binary}/tunerstudio_io.cpp (100%) rename firmware/console/{tunerstudio => binary}/tunerstudio_io.h (100%) delete mode 100644 firmware/console/tunerstudio/tunerstudio.mk diff --git a/firmware/.cproject b/firmware/.cproject index 02d5be253e..99f4a0717d 100644 --- a/firmware/.cproject +++ b/firmware/.cproject @@ -59,7 +59,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -351,7 +351,7 @@ - + @@ -407,7 +407,7 @@ - + @@ -532,7 +532,7 @@ - + @@ -588,7 +588,7 @@ - + @@ -652,7 +652,7 @@ - + @@ -713,7 +713,7 @@ - + diff --git a/firmware/Makefile b/firmware/Makefile index cb276222e9..4f1ec5eeb5 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -94,7 +94,7 @@ include $(CHIBIOS)/os/kernel/kernel.mk #include $(CHIBIOS)/os/various/cpp_wrappers/kernel.mk include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk -include console/tunerstudio/tunerstudio.mk +include console/binary/tunerstudio.mk include ext/ext.mk include hw_layer/hw_layer.mk include development/development.mk @@ -197,7 +197,7 @@ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \ util \ console_util \ console \ - console/tunerstudio \ + console/binary \ hw_layer \ hw_layer/serial_over_usb \ hw_layer/algo \ diff --git a/firmware/console/tunerstudio/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp similarity index 100% rename from firmware/console/tunerstudio/tunerstudio.cpp rename to firmware/console/binary/tunerstudio.cpp diff --git a/firmware/console/tunerstudio/tunerstudio.h b/firmware/console/binary/tunerstudio.h similarity index 100% rename from firmware/console/tunerstudio/tunerstudio.h rename to firmware/console/binary/tunerstudio.h diff --git a/firmware/console/binary/tunerstudio.mk b/firmware/console/binary/tunerstudio.mk new file mode 100644 index 0000000000..6620966dd2 --- /dev/null +++ b/firmware/console/binary/tunerstudio.mk @@ -0,0 +1,3 @@ + +TUNERSTUDIO_SRC_CPP = $(PROJECT_DIR)/console/binary/tunerstudio_io.cpp \ + $(PROJECT_DIR)/console/binary/tunerstudio.cpp diff --git a/firmware/console/tunerstudio/tunerstudio_configuration.h b/firmware/console/binary/tunerstudio_configuration.h similarity index 100% rename from firmware/console/tunerstudio/tunerstudio_configuration.h rename to firmware/console/binary/tunerstudio_configuration.h diff --git a/firmware/console/tunerstudio/tunerstudio_io.cpp b/firmware/console/binary/tunerstudio_io.cpp similarity index 100% rename from firmware/console/tunerstudio/tunerstudio_io.cpp rename to firmware/console/binary/tunerstudio_io.cpp diff --git a/firmware/console/tunerstudio/tunerstudio_io.h b/firmware/console/binary/tunerstudio_io.h similarity index 100% rename from firmware/console/tunerstudio/tunerstudio_io.h rename to firmware/console/binary/tunerstudio_io.h diff --git a/firmware/console/tunerstudio/tunerstudio.mk b/firmware/console/tunerstudio/tunerstudio.mk deleted file mode 100644 index 0d9ecefc98..0000000000 --- a/firmware/console/tunerstudio/tunerstudio.mk +++ /dev/null @@ -1,3 +0,0 @@ - -TUNERSTUDIO_SRC_CPP = $(PROJECT_DIR)/console/tunerstudio/tunerstudio_io.cpp \ - $(PROJECT_DIR)/console/tunerstudio/tunerstudio.cpp diff --git a/firmware/svnversion.h b/firmware/svnversion.h index 3fb6813aa8..d448e5c2fb 100644 --- a/firmware/svnversion.h +++ b/firmware/svnversion.h @@ -1,5 +1,5 @@ // This file was generated by Version2Header -// Sun Mar 01 09:49:22 EST 2015 +// Mon Mar 09 11:02:28 EDT 2015 #ifndef VCS_VERSION -#define VCS_VERSION "7208" +#define VCS_VERSION "7345" #endif