MySensors corrected ID/Battery level for TempHumBaro sensor

Author: gizmocuz

hardware/MQTT.cpp

@@ -182,10 +182,18 @@ void MQTT::OnConnect()
 void MQTT::OnMQTTMessage(char *topicName, int topicLen, void *pMessage)
 {
 	MQTTAsync_message *message = (MQTTAsync_message*)pMessage;
-
+	if (message->payloadlen < 1)
+		return;
+	std::string topic = std::string(topicName, topicName + topicLen);
 	std::string qMessage = std::string((char*)message->payload, (char*)message->payload + message->payloadlen);
 
-	_log.Log(LOG_STATUS, "MQTT: Message: %s", qMessage.c_str());
+	_log.Log(LOG_STATUS, "MQTT: Topic: %s, Message: %s", topic.c_str(), qMessage.c_str());
+
+	if (topic.find("MyMQTT/") != std::string::npos)
+	{
+		//MySensors message
+		_log.Log(LOG_STATUS, "MQTT: MySensors message received!");
+	}
 
 	MQTTAsync_freeMessage(&message);
 	MQTTAsync_free(topicName);

hardware/MySensorsBase.cpp

@@ -193,7 +193,7 @@ void MySensorsBase::SendSensor2Domoticz(const _tMySensorNode *pNode, const _tMyS
 					if (pSensorBaro->floatValue < 1010)
 						forecast = bmpbaroforecast_rain;
 				}
-				SendTempHumBaroSensor(pSensor->nodeID, pSensor->childID, pSensor->floatValue, pSensorHum->intvalue, pSensorBaro->floatValue, forecast);
+				SendTempHumBaroSensor(cNode, pSensor->batValue, pSensor->floatValue, pSensorHum->intvalue, pSensorBaro->floatValue, forecast);
 			}
 		}
 		else if (pSensorHum) {
@@ -225,7 +225,8 @@ void MySensorsBase::SendSensor2Domoticz(const _tMySensorNode *pNode, const _tMyS
 		{
 			if (pSensorTemp->bValidValue && pSensorBaro->bValidValue)
 			{
-				SendTempHumBaroSensor(pSensorTemp->nodeID, pSensorTemp->childID, pSensorTemp->floatValue, pSensor->intvalue, pSensorBaro->floatValue, forecast);
+				cNode = (pSensorTemp->nodeID << 8) | pSensorTemp->childID;
+				SendTempHumBaroSensor(cNode, pSensorTemp->batValue, pSensorTemp->floatValue, pSensor->intvalue, pSensorBaro->floatValue, forecast);
 			}
 		}
 		else if (pSensorTemp) {
@@ -258,7 +259,8 @@ void MySensorsBase::SendSensor2Domoticz(const _tMySensorNode *pNode, const _tMyS
 		{
 			if (pSensorTemp->bValidValue && pSensorHum->bValidValue)
 			{
-				SendTempHumBaroSensor(pSensorTemp->nodeID, pSensorTemp->childID, pSensorTemp->floatValue, pSensorHum->intvalue, pSensor->floatValue, forecast);
+				cNode = (pSensorTemp->nodeID << 8) | pSensorTemp->childID;
+				SendTempHumBaroSensor(cNode, pSensorTemp->batValue, pSensorTemp->floatValue, pSensorHum->intvalue, pSensor->floatValue, forecast);
 			}
 		}
 		else