From be9f811d554588b80482244ecff5264af60e94dc Mon Sep 17 00:00:00 2001
From: Jeeva Kandasamy <jkandasa@gmail.com>
Date: Thu, 10 Dec 2015 04:09:19 +0530
Subject: [PATCH 1/3] fix, send C_STREAM messages to MySensor network world

---
 .../core/MyGatewayTransportMQTTClient.cpp     | 46 +++++++++++++++----
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp b/libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp
index 039eb7c..4eb74bd 100644
--- a/libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp
+++ b/libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp
@@ -25,6 +25,7 @@
 
 // Topic structure: MY_MQTT_PUBLISH_TOPIC_PREFIX/NODE-ID/SENSOR-ID/CMD-TYPE/ACK-FLAG/SUB-TYPE
 
+uint8_t protocolH2i(char c);
 
 
 IPAddress _brokerIp(MY_CONTROLLER_IP_ADDRESS);
@@ -64,8 +65,11 @@ void incomingMQTT(char* topic, byte* payload,
                         unsigned int length)
 {
 	debug(PSTR("Message arrived on topic: %s\n"), topic);
-	char *str, *p;
+	char *str, *p, *value=NULL;
 	uint8_t i = 0;
+	uint8_t bvalue[MAX_PAYLOAD];
+	uint8_t blen = 0;
+	uint8_t command = 0;
 	for (str = strtok_r(topic, "/", &p); str && i <= 5;
 			str = strtok_r(NULL, "/", &p)) {
 		switch (i) {
@@ -89,7 +93,8 @@ void incomingMQTT(char* topic, byte* payload,
 			}
 			case 3: {
 				// Command type
-				mSetCommand(_mqttMsg, atoi(str));
+        command = atoi(str);
+				mSetCommand(_mqttMsg, command);
 				break;
 			}
 			case 4: {
@@ -100,12 +105,25 @@ void incomingMQTT(char* topic, byte* payload,
 			case 5: {
 				// Sub type
 				_mqttMsg.type = atoi(str);
-				// Add payload
-				char* ca;
-				ca = (char *) payload;
-				ca += length;
-				*ca = '\0';
-				_mqttMsg.set((const char*) payload);
+        
+        // Add payload
+        if (command == C_STREAM) {
+					blen = 0;
+					uint8_t val;
+					while (*payload) {
+						val = protocolH2i(*payload++) << 4;
+						val += protocolH2i(*payload++);
+						bvalue[blen] = val;
+						blen++;
+					}
+          _mqttMsg.set(bvalue, blen);
+				} else {
+          char* ca;
+          ca = (char *) payload;
+          ca += length;
+          *ca = '\0';
+          _mqttMsg.set((const char*) payload);
+       }
 				_available = true;
 			}
 		}
@@ -182,3 +200,15 @@ MyMessage & gatewayTransportReceive() {
 	_available = false;
 	return _mqttMsg;
 }
+
+
+uint8_t protocolH2i(char c) {
+	uint8_t i = 0;
+	if (c <= '9')
+		i += c - '0';
+	else if (c >= 'a')
+		i += c - 'a' + 10;
+	else
+		i += c - 'A' + 10;
+	return i;
+}

From d85838f46bad7d54e02fa59fd2040fb71f7cc46a Mon Sep 17 00:00:00 2001
From: Jeeva Kandasamy <jkandasa@gmail.com>
Date: Thu, 10 Dec 2015 04:18:51 +0530
Subject: [PATCH 2/3] realigned to maintain code structure

---
 .../core/MyGatewayTransportMQTTClient.cpp     | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp b/libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp
index 4eb74bd..b458051 100644
--- a/libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp
+++ b/libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp
@@ -93,7 +93,7 @@ void incomingMQTT(char* topic, byte* payload,
 			}
 			case 3: {
 				// Command type
-        command = atoi(str);
+				command = atoi(str);
 				mSetCommand(_mqttMsg, command);
 				break;
 			}
@@ -105,9 +105,8 @@ void incomingMQTT(char* topic, byte* payload,
 			case 5: {
 				// Sub type
 				_mqttMsg.type = atoi(str);
-        
-        // Add payload
-        if (command == C_STREAM) {
+				// Add payload
+				if (command == C_STREAM) {
 					blen = 0;
 					uint8_t val;
 					while (*payload) {
@@ -116,14 +115,14 @@ void incomingMQTT(char* topic, byte* payload,
 						bvalue[blen] = val;
 						blen++;
 					}
-          _mqttMsg.set(bvalue, blen);
+					_mqttMsg.set(bvalue, blen);
 				} else {
-          char* ca;
-          ca = (char *) payload;
-          ca += length;
-          *ca = '\0';
-          _mqttMsg.set((const char*) payload);
-       }
+					char* ca;
+					ca = (char *) payload;
+					ca += length;
+					*ca = '\0';
+					_mqttMsg.set((const char*) payload);
+				}
 				_available = true;
 			}
 		}

From 1ab6f6a669d42ecefe74708520a061e31a85fcae Mon Sep 17 00:00:00 2001
From: Jeeva Kandasamy <jkandasa@gmail.com>
Date: Thu, 10 Dec 2015 13:20:07 +0530
Subject: [PATCH 3/3] Removed unused variable 'value'

---
 libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp b/libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp
index b458051..f49491b 100644
--- a/libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp
+++ b/libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp
@@ -65,7 +65,7 @@ void incomingMQTT(char* topic, byte* payload,
                         unsigned int length)
 {
 	debug(PSTR("Message arrived on topic: %s\n"), topic);
-	char *str, *p, *value=NULL;
+	char *str, *p;
 	uint8_t i = 0;
 	uint8_t bvalue[MAX_PAYLOAD];
 	uint8_t blen = 0;