From 6ab917be668a1b450b0f1c6369124029a6486f9e Mon Sep 17 00:00:00 2001
From: daniel_peintner <daniel_peintner@d9f2db14-54d0-4bde-b00c-16405c910529>
Date: Wed, 27 Aug 2014 14:52:07 +0000
Subject: [PATCH] * adds support for DIN * get ready for next release

git-svn-id: https://svn.code.sf.net/p/openv2g/code/trunk@90 d9f2db14-54d0-4bde-b00c-16405c910529
---
 .cproject                          |  2 ++
 Debug/makefile                     |  1 +
 Debug/sources.mk                   |  1 +
 Debug/src/appHandshake/subdir.mk   |  2 +-
 Debug/src/codec/subdir.mk          |  2 +-
 Debug/src/test/subdir.mk           |  2 +-
 Debug/src/transport/subdir.mk      |  2 +-
 README.txt                         | 12 +++++++++++-
 Release/makefile                   |  1 +
 Release/sources.mk                 |  1 +
 Release/src/appHandshake/subdir.mk |  2 +-
 Release/src/codec/subdir.mk        |  2 +-
 Release/src/test/subdir.mk         |  2 +-
 Release/src/transport/subdir.mk    |  2 +-
 14 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/.cproject b/.cproject
index 11ab1fa..c52baed 100644
--- a/.cproject
+++ b/.cproject
@@ -30,6 +30,7 @@
 							<tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.base.1511109002" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
 								<option id="gnu.c.compiler.option.include.paths.229245493" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;../src/codec&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;../src/din&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../src/appHandshake&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../src/transport&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../src/test&quot;"/>
@@ -89,6 +90,7 @@
 							<tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.base.2107890734" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
 								<option id="gnu.c.compiler.option.include.paths.289860304" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;../src/codec&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;../src/din&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../src/appHandshake&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../src/transport&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../src/test&quot;"/>
diff --git a/Debug/makefile b/Debug/makefile
index 0bf1407..b51a391 100644
--- a/Debug/makefile
+++ b/Debug/makefile
@@ -10,6 +10,7 @@ RM := rm -rf
 -include sources.mk
 -include src/transport/subdir.mk
 -include src/test/subdir.mk
+-include src/din/subdir.mk
 -include src/codec/subdir.mk
 -include src/appHandshake/subdir.mk
 -include subdir.mk
diff --git a/Debug/sources.mk b/Debug/sources.mk
index 0949c99..65bd3c3 100644
--- a/Debug/sources.mk
+++ b/Debug/sources.mk
@@ -15,6 +15,7 @@ EXECUTABLES :=
 SUBDIRS := \
 src/transport \
 src/test \
+src/din \
 src/codec \
 src/appHandshake \
 
diff --git a/Debug/src/appHandshake/subdir.mk b/Debug/src/appHandshake/subdir.mk
index 7ef2fc3..b30d8ce 100644
--- a/Debug/src/appHandshake/subdir.mk
+++ b/Debug/src/appHandshake/subdir.mk
@@ -23,7 +23,7 @@ C_DEPS += \
 src/appHandshake/%.o: ../src/appHandshake/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I"../src/codec" -I"../src/appHandshake" -I"../src/transport" -I"../src/test" -O0 -g3 -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
+	gcc -I"../src/codec" -I"../src/din" -I"../src/appHandshake" -I"../src/transport" -I"../src/test" -O0 -g3 -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 
diff --git a/Debug/src/codec/subdir.mk b/Debug/src/codec/subdir.mk
index 3984869..a48128b 100644
--- a/Debug/src/codec/subdir.mk
+++ b/Debug/src/codec/subdir.mk
@@ -59,7 +59,7 @@ C_DEPS += \
 src/codec/%.o: ../src/codec/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I"../src/codec" -I"../src/appHandshake" -I"../src/transport" -I"../src/test" -O0 -g3 -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
+	gcc -I"../src/codec" -I"../src/din" -I"../src/appHandshake" -I"../src/transport" -I"../src/test" -O0 -g3 -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 
diff --git a/Debug/src/test/subdir.mk b/Debug/src/test/subdir.mk
index 1136c6d..6e210c8 100644
--- a/Debug/src/test/subdir.mk
+++ b/Debug/src/test/subdir.mk
@@ -23,7 +23,7 @@ C_DEPS += \
 src/test/%.o: ../src/test/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I"../src/codec" -I"../src/appHandshake" -I"../src/transport" -I"../src/test" -O0 -g3 -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
+	gcc -I"../src/codec" -I"../src/din" -I"../src/appHandshake" -I"../src/transport" -I"../src/test" -O0 -g3 -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 
diff --git a/Debug/src/transport/subdir.mk b/Debug/src/transport/subdir.mk
index b02a95f..f55e849 100644
--- a/Debug/src/transport/subdir.mk
+++ b/Debug/src/transport/subdir.mk
@@ -17,7 +17,7 @@ C_DEPS += \
 src/transport/%.o: ../src/transport/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I"../src/codec" -I"../src/appHandshake" -I"../src/transport" -I"../src/test" -O0 -g3 -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
+	gcc -I"../src/codec" -I"../src/din" -I"../src/appHandshake" -I"../src/transport" -I"../src/test" -O0 -g3 -Wall -c -fmessage-length=0 -ansi -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 
diff --git a/README.txt b/README.txt
index 7ce842c..b154f11 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
 -------------------------------------------------------------------------
 OpenV2G - an open source project implementing the basic functionality of the ISO IEC 15118 vehicle to grid (V2G) communication interface 
-Version 0.9, released June 19, 2014
+Version 0.9.1, released August ??, 2014
 http://openv2g.sourceforge.net/
 
 Please report bugs via the SourceForge bug tracking system at http://sourceforge.net/tracker/?group_id=350113.
@@ -21,6 +21,16 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+-------------------------------------------------------------------------
+CHANGES from version 0.9:
+-------------------------------------------------------------------------
+* includes DIN support and interoperability with OpenV2G 0.7
+  (needs to be switched on though by #define DEPLOY_DIN_CODEC)
+* fixes warnings for Visual Studio
+* Note: OpenV2G 0.9.1 is a superset of previous versions
+  v2g...c/h files support ISO track
+  din...c/h files support DIN track
+
 -------------------------------------------------------------------------
 CHANGES from version 0.8:
 -------------------------------------------------------------------------
diff --git a/Release/makefile b/Release/makefile
index 0bf1407..b51a391 100644
--- a/Release/makefile
+++ b/Release/makefile
@@ -10,6 +10,7 @@ RM := rm -rf
 -include sources.mk
 -include src/transport/subdir.mk
 -include src/test/subdir.mk
+-include src/din/subdir.mk
 -include src/codec/subdir.mk
 -include src/appHandshake/subdir.mk
 -include subdir.mk
diff --git a/Release/sources.mk b/Release/sources.mk
index 0949c99..65bd3c3 100644
--- a/Release/sources.mk
+++ b/Release/sources.mk
@@ -15,6 +15,7 @@ EXECUTABLES :=
 SUBDIRS := \
 src/transport \
 src/test \
+src/din \
 src/codec \
 src/appHandshake \
 
diff --git a/Release/src/appHandshake/subdir.mk b/Release/src/appHandshake/subdir.mk
index 1e2a7a1..7a51464 100644
--- a/Release/src/appHandshake/subdir.mk
+++ b/Release/src/appHandshake/subdir.mk
@@ -23,7 +23,7 @@ C_DEPS += \
 src/appHandshake/%.o: ../src/appHandshake/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I"../src/codec" -I"../src/appHandshake" -I"../src/transport" -I"../src/test" -Os -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
+	gcc -I"../src/codec" -I"../src/din" -I"../src/appHandshake" -I"../src/transport" -I"../src/test" -Os -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 
diff --git a/Release/src/codec/subdir.mk b/Release/src/codec/subdir.mk
index eeb9987..6271be5 100644
--- a/Release/src/codec/subdir.mk
+++ b/Release/src/codec/subdir.mk
@@ -59,7 +59,7 @@ C_DEPS += \
 src/codec/%.o: ../src/codec/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I"../src/codec" -I"../src/appHandshake" -I"../src/transport" -I"../src/test" -Os -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
+	gcc -I"../src/codec" -I"../src/din" -I"../src/appHandshake" -I"../src/transport" -I"../src/test" -Os -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 
diff --git a/Release/src/test/subdir.mk b/Release/src/test/subdir.mk
index 44a3786..0c36dd6 100644
--- a/Release/src/test/subdir.mk
+++ b/Release/src/test/subdir.mk
@@ -23,7 +23,7 @@ C_DEPS += \
 src/test/%.o: ../src/test/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I"../src/codec" -I"../src/appHandshake" -I"../src/transport" -I"../src/test" -Os -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
+	gcc -I"../src/codec" -I"../src/din" -I"../src/appHandshake" -I"../src/transport" -I"../src/test" -Os -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '
 
diff --git a/Release/src/transport/subdir.mk b/Release/src/transport/subdir.mk
index 2abf99f..6af4b8b 100644
--- a/Release/src/transport/subdir.mk
+++ b/Release/src/transport/subdir.mk
@@ -17,7 +17,7 @@ C_DEPS += \
 src/transport/%.o: ../src/transport/%.c
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C Compiler'
-	gcc -I"../src/codec" -I"../src/appHandshake" -I"../src/transport" -I"../src/test" -Os -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
+	gcc -I"../src/codec" -I"../src/din" -I"../src/appHandshake" -I"../src/transport" -I"../src/test" -Os -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
 	@echo 'Finished building: $<'
 	@echo ' '