mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add ESP-NOW hooks

This commit is contained in:
Theo Arends 2021-06-22 14:12:05 +02:00
parent 41db97ea1f
commit 096f5606b6
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tasmota/xdrv_02_9_mqtt.ino
View File

@ -476,6 +476,13 @@ bool MqttPublishLib(const char* topic, const uint8_t* payload, unsigned int plen
} }
} }
#ifdef USE_TASMESH
if (MESHrouteMQTTtoMESH(topic, (char*)payload, retained)) { // If we are a node, send this via ESP-Now
yield();
return true;
}
#endif // USE_TASMESH
#ifdef USE_MQTT_AZURE_IOT #ifdef USE_MQTT_AZURE_IOT
String sourceTopicString = urlEncodeBase64(String(topic)); String sourceTopicString = urlEncodeBase64(String(topic));
String topicString = "devices/" + String(SettingsText(SET_MQTT_CLIENT)); String topicString = "devices/" + String(SettingsText(SET_MQTT_CLIENT));
@ -555,6 +562,14 @@ void MqttDataHandler(char* mqtt_topic, uint8_t* mqtt_data, unsigned int data_len
TasmotaGlobal.masterlog_level = LOG_LEVEL_DEBUG_MORE; // Hide logging TasmotaGlobal.masterlog_level = LOG_LEVEL_DEBUG_MORE; // Hide logging
} }
#ifdef USE_TASMESH
#ifdef ESP32
if (MESHinterceptMQTTonBroker(topic, (uint8_t*)mqtt_data, data_len +1)) {
return; // Check if this is a message for a node
}
#endif // ESP32
#endif // USE_TASMESH
// MQTT pre-processing // MQTT pre-processing
XdrvMailbox.index = strlen(topic); XdrvMailbox.index = strlen(topic);
XdrvMailbox.data_len = data_len; XdrvMailbox.data_len = data_len;
@ -621,7 +636,11 @@ void MqttPublishPayload(const char* topic, const char* payload, uint32_t binary_
// To lower heap usage the payload is not copied to the heap but used directly // To lower heap usage the payload is not copied to the heap but used directly
String log_data_topic; // 20210420 Moved to heap to solve tight stack resulting in exception 2 String log_data_topic; // 20210420 Moved to heap to solve tight stack resulting in exception 2
if (Settings->flag.mqtt_enabled && MqttPublishLib(topic, (const uint8_t*)payload, binary_length, retained)) { // SetOption3 - Enable MQTT if (Settings->flag.mqtt_enabled && MqttPublishLib(topic, (const uint8_t*)payload, binary_length, retained)) { // SetOption3 - Enable MQTT
#ifdef USE_TASMESH
log_data_topic = (MESHroleNode()) ? F("MSH: ") : F(D_LOG_MQTT); // MSH: or MQT:
#else
log_data_topic = F(D_LOG_MQTT); // MQT: log_data_topic = F(D_LOG_MQTT); // MQT:
#endif
log_data_topic += topic; // stat/tasmota/STATUS2 log_data_topic += topic; // stat/tasmota/STATUS2
} else { } else {
log_data_topic = F(D_LOG_RESULT); // RSL: log_data_topic = F(D_LOG_RESULT); // RSL: