MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #284 from jkandasa/development

Browse Source 
Fix OTA update functionality on MQTT transport
This commit is contained in:
Henrik Ekblad
2015-12-10 10:50:20 +01:00
parent 9540cb2b30 1ab6f6a669
commit 022cbbe866
1 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/core/MyGatewayTransportMQTTClient.cpp
+35 -6
View File
@@ -25,6 +25,7 @@
// Topic structure: MY_MQTT_PUBLISH_TOPIC_PREFIX/NODE-ID/SENSOR-ID/CMD-TYPE/ACK-FLAG/SUB-TYPE // 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); IPAddress _brokerIp(MY_CONTROLLER_IP_ADDRESS);
@@ -66,6 +67,9 @@ void incomingMQTT(char* topic, byte* payload,
debug(PSTR("Message arrived on topic: %s\n"), topic); debug(PSTR("Message arrived on topic: %s\n"), topic);
char *str, *p; char *str, *p;
uint8_t i = 0; 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; for (str = strtok_r(topic, "/", &p); str && i <= 5;
str = strtok_r(NULL, "/", &p)) { str = strtok_r(NULL, "/", &p)) {
switch (i) { switch (i) {
@@ -89,7 +93,8 @@ void incomingMQTT(char* topic, byte* payload,
} }
case 3: { case 3: {
// Command type // Command type
mSetCommand(_mqttMsg, atoi(str)); command = atoi(str);
mSetCommand(_mqttMsg, command);
break; break;
} }
case 4: { case 4: {
@@ -101,11 +106,23 @@ void incomingMQTT(char* topic, byte* payload,
// Sub type // Sub type
_mqttMsg.type = atoi(str); _mqttMsg.type = atoi(str);
// Add payload // Add payload
char* ca; if (command == C_STREAM) {
ca = (char *) payload; blen = 0;
ca += length; uint8_t val;
*ca = '\0'; while (*payload) {
_mqttMsg.set((const char*) 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; _available = true;
} }
} }
@@ -182,3 +199,15 @@ MyMessage & gatewayTransportReceive() {
_available = false; _available = false;
return _mqttMsg; 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;
}