From 5bd74035c5de9a70eee07394318a23028d8bf11d Mon Sep 17 00:00:00 2001
From: john30 <ebusd@johnm.de>
Date: Sun, 22 Mar 2015 14:01:51 +0100
Subject: [PATCH] extended max allowed data length to 25

---
 src/lib/ebus/data.h                | 4 ++--
 src/lib/ebus/test/test_data.cpp    | 3 ++-
 src/lib/ebus/test/test_message.cpp | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/lib/ebus/data.h b/src/lib/ebus/data.h
index 452974de..c07575d2 100644
--- a/src/lib/ebus/data.h
+++ b/src/lib/ebus/data.h
@@ -85,8 +85,8 @@ typedef struct {
 	const short divisorOrFirstBit;       //!< @a bt_number: divisor (negative for reciprocal) or offset to first bit (if (@a bitCount%8)!=0)
 } dataType_t;
 
-/** the maximum position within master or slave data. */
-#define MAX_POS 16
+/** the maximum allowed position within master or slave data. */
+#define MAX_POS 24
 
 /**
  * Parse an unsigned int value.
diff --git a/src/lib/ebus/test/test_data.cpp b/src/lib/ebus/test/test_data.cpp
index 2448ab28..bb3d1b70 100644
--- a/src/lib/ebus/test/test_data.cpp
+++ b/src/lib/ebus/test/test_data.cpp
@@ -51,7 +51,8 @@ int main()
 		{"x,,str:10",  "Hallo, Du ",                    "10fe07000a48616c6c6f2c20447520", "00", ""},
 		{"x,,str:10",  "          ",                    "10fe07000a20202020202020202020", "00", ""},
 		{"x,,str:11",  "",                              "10fe07000a20202020202020202020", "00", "rW"},
-		{"x,,hex",      "20",                            "10fe07000120",                   "00", ""},
+		{"x,,str:24",  "abcdefghijklmnopqrstuvwx",      "10fe0700186162636465666768696a6b6c6d6e6f707172737475767778", "00", ""},
+		{"x,,hex",     "20",                            "10fe07000120",                   "00", ""},
 		{"x,,hex:10",  "48 61 6c 6c 6f 2c 20 44 75 21", "10fe07000a48616c6c6f2c20447521", "00", ""},
 		{"x,,hex:11",  "",                              "10fe07000a48616c6c6f2c20447521", "00", "rW"},
 		{"x,,bda",   "26.10.2014","10fe07000426100614", "00", ""}, // Sunday
diff --git a/src/lib/ebus/test/test_message.cpp b/src/lib/ebus/test/test_message.cpp
index 2057e2d2..643ec60c 100644
--- a/src/lib/ebus/test/test_message.cpp
+++ b/src/lib/ebus/test/test_message.cpp
@@ -68,8 +68,8 @@ int main()
 		{"u,ehp,hwTankTemp,Speichertemperatur IST,,25,B509,290000,,,IGN:2,,,,,,tempsensor", "","","","M"},
 		{"", "55.50;ok","1025b50903290000","050000780300","d"},
 		{"r,ehp,datetime,Datum Uhrzeit,,50,B504,00,,,dcfstate,,,,time,,BTI,,,,date,,BDA,,,,temp,,temp2", "valid;08:24:51;31.12.2014;-0.875", "1050b5040100", "0a035124083112031420ff", "md" },
-		{"r,ehp,bad,invalid pos,,50,B5ff,000102,,m,tempsensor;tempsensor;tempsensor;tempsensor;power;power,,,", "", "", "", "c" },
-		{"r,ehp,bad,invalid pos,,50,B5ff,,,s,tempsensor;tempsensor;tempsensor;tempsensor;tempsensor;power;power,,,", "", "", "", "c" },
+		{"r,ehp,bad,invalid pos,,50,B5ff,000102,,m,HEX:8;tempsensor;tempsensor;tempsensor;tempsensor;power;power,,,", "", "", "", "c" },
+		{"r,ehp,bad,invalid pos,,50,B5ff,,,s,HEX:8;tempsensor;tempsensor;tempsensor;tempsensor;tempsensor;power;power,,,", "", "", "", "c" },
 	};
 	DataFieldTemplates* templates = new DataFieldTemplates();
 	MessageMap* messages = new MessageMap();