Browse Source

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

pull/461/head
Xose Pérez 6 years ago
parent
commit
a662083abd
2 changed files with 9 additions and 5 deletions
  1. +2
    -4
      code/espurna/mqtt.ino
  2. +7
    -1
      code/espurna/system.ino

+ 2
- 4
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();
}


+ 7
- 1
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();
}


Loading…
Cancel
Save