Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-11 10:47:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash when calling idbSend from an MQTT callback (#410)

Browse Source
This commit is contained in:
Xose Pérez
2018-01-21 09:30:13 +01:00
parent b1542f1574
commit a662083abd
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/espurna/mqtt.ino
View File

@@ -345,10 +345,8 @@ void _mqttCallback(unsigned int type, const char * topic, const char * payload)
// Subscribe to internal action topics
mqttSubscribe(MQTT_TOPIC_ACTION);
// Send heartbeat messages
#if HEARTBEAT_ENABLED
heartbeat();
#endif
// Flag system to send heartbeat
systemSendHeartbeat();
}

8
code/espurna/system.ino
View File

@@ -11,6 +11,7 @@ Copyright (C) 2018 by Xose Pérez <xose dot perez at gmail dot com>
// -----------------------------------------------------------------------------
unsigned long _loopDelay = 0;
bool _system_send_heartbeat = false;
// -----------------------------------------------------------------------------
@@ -58,6 +59,10 @@ void systemCheckLoop() {
// -----------------------------------------------------------------------------
void systemSendHeartbeat() {
_system_send_heartbeat = true;
}
void systemLoop() {
// Check system stability
@@ -68,7 +73,8 @@ void systemLoop() {
#if HEARTBEAT_ENABLED
// Heartbeat
static unsigned long last = 0;
if ((last == 0) || (millis() - last > HEARTBEAT_INTERVAL)) {
if (_system_send_heartbeat || (last == 0) || (millis() - last > HEARTBEAT_INTERVAL)) {
_system_send_heartbeat = false;
last = millis();
heartbeat();
}