Fix Hass Software Watchdog

Fix Hass Software Watchdog exception during discovery (#4988)

sonoff/_changelog.ino

@@ -1,5 +1,6 @@
 /* 6.4.1.10 20190121
  * Fix Hass discovery of MHZ19(B) sensors (#4992)
+ * Fix Hass Software Watchdog exception during discovery (#4988)
  *
  * 6.4.1.9 20190115
  * Add support for Mi LED Desk Lamp with rotary switch (#4887)

sonoff/sonoff.ino

@@ -772,7 +772,7 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len)
             }
 #ifdef USE_HOME_ASSISTANT
             if ((19 == pindex) || (30 == pindex)) {
-              HAssDiscovery(1);  // hass_discovery or hass_light
+              HAssDiscover();    // Delayed execution to provide enough resources during hass_discovery or hass_light
             }
 #endif  // USE_HOME_ASSISTANT
           }

sonoff/xdrv_12_home_assistant.ino

@@ -133,6 +133,9 @@ const char HASS_DISCOVER_DEVICE_INFO[] PROGMEM =
 const char HASS_DISCOVER_TOPIC_PREFIX[] PROGMEM =
   "%s, \"~\":\"%s\"";
 
+uint8_t hass_init_step = 0;
+uint8_t hass_mode = 0;
+
 static void FindPrefix(char* s1, char* s2, char* out)
 {
   int prefixlen = 0;
@@ -423,6 +426,7 @@ void HAssAnnounceSensor(const char* sensorname, const char* subsensortype)
 void HAssAnnounceSensors(void)
 {
   uint8_t hass_xsns_index = 0;
+
   do {
     mqtt_data[0] = '\0';
     int tele_period_save = tele_period;
@@ -435,9 +439,13 @@ void HAssAnnounceSensors(void)
 
     if (strlen(sensordata)) {
       sensordata[0] = '{';                             // {"INA219":{"Voltage":4.494,"Current":0.020,"Power":0.089}
-      snprintf_P(sensordata, sizeof(sensordata), PSTR("%s}"), sensordata);
+      snprintf_P(sensordata, sizeof(sensordata), PSTR("%s}"), sensordata);  // {"INA219":{"Voltage":4.494,"Current":0.020,"Power":0.089}}
 
-      StaticJsonBuffer<256> jsonBuffer;
+      // JsonBuffer size calculation (https://arduinojson.org/v5/assistant/)
+      // 383 = {"MCP230XX":{"D0":0,"D1":0,"D2":0,"D3":0,"D4":0,"D5":0,"D6":0,"D7":0,"D8":0,"D9":0,"D10":0,"D11":0,"D12":0,"D13":0,"D14":0,"D15":0}}
+      // 381 = {"MPR121A":{"Button0":0,"Button1":0,"Button2":0,"Button3":0,"Button4":0,"Button5":0,"Button6":0,"Button7":0,"Button8":0,"Button9":0,"Button10":0,"Button11":0,"Button12":0}}
+      // 420 = {"ENERGY":{"TotalStartTime":"2018-10-30T17:09:47","Total":2.684,"Yesterday":0.020,"Today":0.006,"Period":0.04,"Power":0.49,"ApparentPower":4.71,"ReactivePower":4.70,"Factor":0.10,"Frequency":50.04,"Voltage":226.3,"Current":0.021}}
+      StaticJsonBuffer<500> jsonBuffer;
       JsonObject& root = jsonBuffer.parseObject(sensordata);
       if (!root.success()) {
         snprintf_P(log_data, sizeof(log_data), PSTR("HASS: failed to parse '%s'"), sensordata);
@@ -469,7 +477,7 @@ static int string_ends_with(const char * str, const char * suffix)
   return (str_len >= suffix_len) && (0 == strcmp(str + (str_len-suffix_len), suffix));
 }
 
-void HAssDiscovery(uint8_t mode)
+void HAssDiscovery(void)
 {
   // Configure Tasmota for default Home Assistant parameters to keep discovery message as short as possible
   if (Settings.flag.hass_discovery) {
@@ -480,10 +488,11 @@ void HAssDiscovery(uint8_t mode)
     if (!string_ends_with(Settings.mqtt_fulltopic, "%prefix%/")) {
       strncpy_P(Settings.mqtt_fulltopic, PSTR("%topic%/%prefix%/"), sizeof(Settings.mqtt_fulltopic));
       restart_flag = 2;
+      return;                                // As full topic has changed do restart first before sending discovery data
     }
   }
 
-  if (Settings.flag.hass_discovery || (1 == mode)) {
+  if (Settings.flag.hass_discovery || (1 == hass_mode)) {
     // Send info about relays and lights
     HAssAnnounceRelayLight();
 
@@ -498,49 +507,11 @@ void HAssDiscovery(uint8_t mode)
   }
 }
 
-/*
+void HAssDiscover(void)
-#define D_CMND_HASSDISCOVER "HassDiscover"
-
-enum HassCommands { CMND_HASSDISCOVER };
-const char kHassCommands[] PROGMEM = D_CMND_HASSDISCOVER ;
-
-boolean HassCommand(void)
 {
-  char command[CMDSZ];
+  hass_mode = 1;                             // Force discovery
-  boolean serviced = true;
+  hass_init_step = 1;                        // Delayed discovery
-
-  int command_code = GetCommandCode(command, sizeof(command), XdrvMailbox.topic, kHassCommands);
-  if (-1 == command_code) {
-    serviced = false;  // Unknown command
 }
-  else if (CMND_HASSDISCOVER == command_code) {
-    if (XdrvMailbox.data_len > 0) {
-      switch (XdrvMailbox.payload) {
-      case 0: // Off
-      case 1: // On
-        Settings.flag.hass_discovery = XdrvMailbox.payload;
-        break;
-      case 2: // Toggle
-        Settings.flag.hass_discovery ^= 1;
-        break;
-      case 4: // Off
-      case 5: // On
-        Settings.flag.hass_light = XdrvMailbox.payload &1;
-        break;
-      case 6: // Toggle
-        Settings.flag.hass_light ^= 1;
-        break;
-      }
-      HAssDiscovery(1);
-    }
-    snprintf_P (mqtt_data, sizeof(mqtt_data), PSTR("{\"%s\":\"%s\",\"Force light\":\"%s\"}"),
-      command, GetStateText(Settings.flag.hass_discovery), GetStateText(Settings.flag.hass_light));
-  }
-  else serviced = false;  // Unknown command
-
-  return serviced;
-}
-*/
 
 /*********************************************************************************************\
  * Interface
@@ -553,13 +524,17 @@ boolean Xdrv12(byte function)
   if (Settings.flag.mqtt_enabled) {
     switch (function) {
       case FUNC_MQTT_INIT:
-        HAssDiscovery(0);
+        hass_mode = 0;                       // Discovery only if Settings.flag.hass_discovery is set
+        hass_init_step = 2;                  // Delayed discovery
         break;
-/*
+      case FUNC_EVERY_SECOND:
-      case FUNC_COMMAND:
+        if (hass_init_step) {
-        result = HassCommand();
+          hass_init_step--;
+          if (!hass_init_step) {
+            HAssDiscovery();                 // Scheduled discovery using available resources
+          }
+        }
         break;
-*/
     }
   }
   return result;