From a1952df4dcd5c733d7624e5f8bad0ac42cda94da Mon Sep 17 00:00:00 2001
From: john30 <ebusd@johnm.de>
Date: Fri, 23 Dec 2016 14:00:01 +0100
Subject: [PATCH 1/5] formatting

---
 src/lib/ebus/message.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 src/lib/ebus/message.cpp

diff --git a/src/lib/ebus/message.cpp b/src/lib/ebus/message.cpp
old mode 100644
new mode 100755
index df25d79f..aa705194
--- a/src/lib/ebus/message.cpp
+++ b/src/lib/ebus/message.cpp
@@ -1676,8 +1676,9 @@ result_t MessageMap::addFromFile(vector<string>::iterator& begin, const vector<s
 	string types = *restart;
 	Condition* condition = NULL;
 	result_t result = readConditions(types, filename, condition);
-	if (result!=RESULT_OK)
+	if (result!=RESULT_OK) {
 		return result;
+	}
 	if (types.length()>0 && types[0]=='!') {
 		// instruction
 		types = types.substr(1);
@@ -1697,11 +1698,11 @@ result_t MessageMap::addFromFile(vector<string>::iterator& begin, const vector<s
 		}
 		return RESULT_OK;
 	}
-	if (types.length() == 0)
+	if (types.length() == 0) {
 		types.append("r");
-	else if (types.find(']')!=string::npos)
+	} else if (types.find(']')!=string::npos) {
 		return RESULT_ERR_INVALID_ARG;
-
+	}
 	result = RESULT_ERR_EOF;
 	DataFieldTemplates* templates = getTemplates(filename);
 	istringstream stream(types);
@@ -1717,16 +1718,19 @@ result_t MessageMap::addFromFile(vector<string>::iterator& begin, const vector<s
 			Message* message = *it;
 			if (result == RESULT_OK) {
 				result = add(message);
-				if (result==RESULT_ERR_DUPLICATE_NAME)
+				if (result==RESULT_ERR_DUPLICATE_NAME) {
 					begin = restart+3; // mark name as invalid
-				else if (result==RESULT_ERR_DUPLICATE)
+				} else if (result==RESULT_ERR_DUPLICATE) {
 					begin = restart+8; // mark ID as invalid
+				}
 			}
-			if (result != RESULT_OK)
+			if (result != RESULT_OK) {
 				delete message; // delete all remaining messages on error
+			}
 		}
-		if (result != RESULT_OK)
+		if (result != RESULT_OK) {
 			return result;
+		}
 	}
 	return result;
 }

From c777376449d04bf7d54e3bb7a8145c78af668b52 Mon Sep 17 00:00:00 2001
From: john30 <ebusd@johnm.de>
Date: Fri, 23 Dec 2016 14:00:47 +0100
Subject: [PATCH 2/5] formatting

---
 src/lib/ebus/message.cpp | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 src/lib/ebus/message.cpp

diff --git a/src/lib/ebus/message.cpp b/src/lib/ebus/message.cpp
old mode 100755
new mode 100644

From f4d03486790d1679bda0433e75b798a690a09fdc Mon Sep 17 00:00:00 2001
From: john30 <ebusd@johnm.de>
Date: Fri, 23 Dec 2016 14:01:21 +0100
Subject: [PATCH 3/5] corrected csv err position reporting

---
 src/lib/ebus/data.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/lib/ebus/data.cpp b/src/lib/ebus/data.cpp
index 9b7f5485..cbf14c66 100644
--- a/src/lib/ebus/data.cpp
+++ b/src/lib/ebus/data.cpp
@@ -93,6 +93,7 @@ result_t DataField::create(vector<string>::iterator& it,
 		}
 
 		const string typeStr = *it++; // basetype[:len]|template[:name]
+		vector<string>::iterator typePos = it;
 		if (typeStr.empty()) {
 			if (!name.empty() || hasPartStr) {
 				result = RESULT_ERR_MISSING_TYPE;
@@ -203,10 +204,14 @@ result_t DataField::create(vector<string>::iterator& it,
 				result = SingleDataField::create(typeName, length, firstType ? name : "", firstType ? comment : "", firstType ? unit : "", partType, divisor, values, constantValue, verifyValue, add);
 				if (add != NULL) {
 					fields.push_back(add);
-				} else if (result == RESULT_OK) {
-					result = RESULT_ERR_NOTFOUND; // type not found
+				} else {
+					it = typePos; // back to type
+					if (result == RESULT_OK) {
+						result = RESULT_ERR_NOTFOUND; // type not found
+					}
 				}
 			} else if (!constantValue.empty()) {
+				it = typePos; // back to type
 				result = RESULT_ERR_INVALID_ARG; // invalid value list
 			} else { // template[:name]
 				string fieldName;
@@ -217,6 +222,9 @@ result_t DataField::create(vector<string>::iterator& it,
 					fieldName = (firstType && lastType) ? name : "";
 				}
 				result = templ->derive(fieldName, firstType ? comment : "", firstType ? unit : "", partType, divisor, values, fields);
+				if (result != RESULT_OK) {
+					it = typePos; // back to type
+				}
 			}
 			firstType = false;
 		}

From 448003259bdc079dc097dadfa75a1027bbb3e8be Mon Sep 17 00:00:00 2001
From: John <ebusd@ebusd.eu>
Date: Tue, 27 Dec 2016 15:14:39 +0100
Subject: [PATCH 4/5] Set theme jekyll-theme-tactile

---
 docs/_config.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/_config.yml

diff --git a/docs/_config.yml b/docs/_config.yml
new file mode 100644
index 00000000..259a24e4
--- /dev/null
+++ b/docs/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-tactile
\ No newline at end of file

From 64768b54ed9752c7c6662dea42cf16194a0281d6 Mon Sep 17 00:00:00 2001
From: John <ebusd@ebusd.eu>
Date: Tue, 27 Dec 2016 15:21:51 +0100
Subject: [PATCH 5/5] removed gh-pages again

---
 docs/_config.yml | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 docs/_config.yml

diff --git a/docs/_config.yml b/docs/_config.yml
deleted file mode 100644
index 259a24e4..00000000
--- a/docs/_config.yml
+++ /dev/null
@@ -1 +0,0 @@
-theme: jekyll-theme-tactile
\ No newline at end of file