Reboot the device if there is no wifi connection for 5 minutes

As a workaround for WiFi issues.

Make sure that reboot only happens when there's nothing else going on
and that the output state is preserved.

#310

Author: rojer

mos.yml

@@ -382,6 +382,10 @@ conds:
         - ["wifi.ap.gw", ""]
         - ["wifi.ap.dhcp_start", "192.168.33.2"]
         - ["wifi.ap.dhcp_end", "192.168.33.100"]
+        - ["wifi.sta_connect_timeout", 15]
+        # This is a mitigation for devices dropping of wifi and never coming back.
+        # While this is being investigated, the workaround is to reboot if not connected for 5 minutes when supposed to be.
+        - ["shelly.wifi_connect_reboot_timeout", "i", 300, {title: "If not connected for this long when supposed to be, reboot"}]
       libs:
         - origin: https://github.com/mongoose-os-libs/adc
         - origin: https://github.com/mongoose-os-libs/wifi

src/Shelly1L/shelly_init.cpp

@@ -36,7 +36,7 @@ void CreatePeripherals(std::vector<std::unique_ptr<Input>> *inputs,
   auto *in2 = new NoisyInputPin(2, 14, 1, MGOS_GPIO_PULL_NONE, false);
   in2->Init();
   inputs->emplace_back(in2);
-#if 0 // 1L uses BL0937 in current-only mode. This is not yet supported.
+#if 0  // 1L uses BL0937 in current-only mode. This is not yet supported.
   std::unique_ptr<PowerMeter> pm(new BL0937PowerMeter(1, -1, 4, -1));
   if (pm->Init().ok()) {
     pms->emplace_back(std::move(pm));

src/shelly_main.cpp

@@ -25,12 +25,18 @@
 #include "mgos_http_server.h"
 #include "mgos_ota.h"
 #include "mgos_rpc.h"
+#ifdef MGOS_HAVE_WIFI
+#include "mgos_wifi.h"
+#endif
 
 #include "mongoose.h"
 
 #if CS_PLATFORM == CS_P_ESP8266
 #include "esp_coredump.h"
 #include "esp_rboot.h"
+extern "C" {
+#include "user_interface.h"
+}
 #endif
 
 #include "HAP.h"
@@ -543,6 +549,26 @@ static void StatusTimerCB(void *arg) {
                   (sys_temp.ok() ? sys_temp.ValueOrDie() : 0), status.c_str()));
     s_cnt = 0;
   }
+#ifdef MGOS_HAVE_WIFI
+  if (mgos_sys_config_get_wifi_sta_enable() &&
+      mgos_sys_config_get_shelly_wifi_connect_reboot_timeout() > 0) {
+    static int64_t s_last_connected = 0;
+    int64_t now = mgos_uptime_micros();
+    struct mgos_net_ip_info ip_info;
+    if (mgos_net_get_ip_info(MGOS_NET_IF_TYPE_WIFI, MGOS_NET_IF_WIFI_STA,
+                             &ip_info)) {
+      s_last_connected = now;
+    } else if (AllComponentsIdle()) {  // Only reboot if all components are
+                                       // idle.
+      int64_t timeout_micros =
+          mgos_sys_config_get_shelly_wifi_connect_reboot_timeout() * 1000000;
+      if (now - s_last_connected > timeout_micros) {
+        LOG(LL_ERROR, ("Not connected for too long, rebooting"));
+        mgos_system_restart_after(500);
+      }
+    }
+  }
+#endif  // MGOS_HAVE_WIFI
   (void) arg;
 }
 
@@ -791,6 +817,15 @@ bool WipeDevice() {
   return wiped;
 }
 
+bool IsSoftReboot() {
+#if CS_PLATFORM == CS_P_ESP8266
+  const struct rst_info *ri = system_get_rst_info();
+  return (ri->reason == REASON_SOFT_RESTART);
+#else
+  return false;
+#endif
+}
+
 void InitApp() {
   if (s_failsafe_mode) {
     if (WipeDevice()) {

src/shelly_main.hpp

@@ -52,6 +52,8 @@ void RestartService();
 
 bool WipeDevice();
 
+bool IsSoftReboot();
+
 StatusOr<int> GetSystemTemperature();
 
 #define SHELLY_SERVICE_FLAG_UPDATE (1 << 0)

src/shelly_switch.cpp

@@ -21,6 +21,8 @@
 #include "mgos_hap_accessory.hpp"
 #include "mgos_hap_chars.hpp"
 
+#include "shelly_main.hpp"
+
 namespace shelly {
 
 ShellySwitch::ShellySwitch(int id, Input *in, Output *out, PowerMeter *out_pm,
@@ -163,24 +165,28 @@ Status ShellySwitch::Init() {
         std::bind(&ShellySwitch::InputEventHandler, this, _1, _2));
     in_->SetInvert(cfg_->in_inverted);
   }
-  switch (static_cast<InitialState>(cfg_->initial_state)) {
-    case InitialState::kOff:
-      SetOutputState(false, "init");
-      break;
-    case InitialState::kOn:
-      SetOutputState(true, "init");
-      break;
-    case InitialState::kLast:
-      SetOutputState(cfg_->state, "init");
-      break;
-    case InitialState::kInput:
-      if (in_ != nullptr &&
-          cfg_->in_mode == static_cast<int>(InMode::kToggle)) {
-        SetOutputState(in_->GetState(), "init");
-      }
-      break;
-    case InitialState::kMax:
-      break;
+  bool should_restore = (cfg_->initial_state == (int) InitialState::kLast);
+  if (IsSoftReboot()) should_restore = true;
+  if (should_restore) {
+    SetOutputState(cfg_->state, "init");
+  } else {
+    switch (static_cast<InitialState>(cfg_->initial_state)) {
+      case InitialState::kOff:
+        SetOutputState(false, "init");
+        break;
+      case InitialState::kOn:
+        SetOutputState(true, "init");
+        break;
+      case InitialState::kInput:
+        if (in_ != nullptr &&
+            cfg_->in_mode == static_cast<int>(InMode::kToggle)) {
+          SetOutputState(in_->GetState(), "init");
+        }
+        break;
+      case InitialState::kLast:
+      case InitialState::kMax:
+        break;
+    }
   }
   LOG(LL_INFO, ("Exporting '%s': type %d, state: %d", cfg_->name,
                 cfg_->svc_type, out_->GetState()));