Reset via input switch toggles, doc updates

Author: rojer

README.md

@@ -6,6 +6,8 @@ Firmware is compatible with stock and can be uploaded via OTA.
 
 Reverting to stock firmware is also supported (see below).
 
+At the moment only switch functionality is supported - no scheduling, power measurement, etc.
+
 ## Updating from stock firmware
 
  * Download one of the release builds (see Releases) or build a firmware package yourself (see Building below).
@@ -41,12 +43,18 @@ Reverting to stock firmware is also supported (see below).
 
  * Enjoy!
 
-## Reset
+## Recovery
+
+ Device can be recovered from invalid wifi configuration with one of two methods:
 
+  * On Shelly2.5 press and hold the button for 10 seconds.
+  * On both models within first 60 seconds of boot, toggle input switch 10 times in succession.
+
+ Both of these methods will make device go int AP mode where they can be reconfigured.
 
 ## LED indication
 
- Shelly25 has an LED that is used to indicate current status of the device
+ Shelly2.5 has an LED that is used to indicate current status of the device
 
  * Off - fully provisioned, connected to WiFi, paired.
  * Off, short on pulses - HAP server not provisioned (code not set).
@@ -59,14 +67,59 @@ Reverting to stock firmware is also supported (see below).
 
  It is possible to revert back to stock firmware.
 
- TODO(rojer): document.
+ Stock firmware for Shelly1 can be downloaded [here](http://api.shelly.cloud/firmware/SHSW-1_build.zip),
+ for Shelly2.5 it's [here](http://api.shelly.cloud/firmware/SHSW-25_build.zip).
+
+ Download it and upload via web interface (this firmware does not support pulling from a remote URL).
 
 ## Building
- * Build and flash the firmware
 
-   * When building, specify `MODEL=Shelly1` or `MODEL=Shelly25`
+When building, specify `MODEL=Shelly1` or `MODEL=Shelly25`
 
 ```
 mos build --verbose --local --platform esp8266 --build-var MODEL=Shelly1
 ```
 
+## Contributions and development
+
+Contributions are welcome!
+
+### OTA method
+
+For development, OTA method is recommended.
+
+Firmware suports OTA via both RPC and HTTP POST, so something like
+
+```
+ $ make Shelly25 && curl -F commit_timeout=120 -F file=@build_Shelly25/fw.zip http://192.168.11.75/update
+```
+
+Note the use of commit timeout: if something goes wrong (as it invariably does during development),
+device will revert to previous firmware automatically. If you are happy with the result, you have 2 minutes
+to commit the firmware via `curl http://192.168.11.75/update/commit` or `mos --port=ws://192.168.11.75/rpc call OTA.Commit`.
+
+### UDP logging
+
+To get remote access to logs, configure UDP logging:
+
+```
+ $ mos --port=ws://192.168.11.75/rpc config-set debug.udp_log_addr=192.168.11.30:1234
+```
+
+192.168.11.30 is the address of your workstation (or any address, really - even external).
+
+Then use any UDP listener such as netcat to catch the logs. It is also integrated into mos console:
+
+```
+ $ mos --port udp://:1234/ console
+Listening on UDP port 1234...
+[Feb  2 03:45:27.030] shellyswitch25-B955B6 59 18.558 2|shelly_main.c:248       Tick uptime: 18.55, RAM: 32880, 22264 free
+[Feb  2 03:45:28.058] shellyswitch25-B955B6 60 19.558 2|shelly_main.c:248       Tock uptime: 19.55, RAM: 32880, 22264 free
+...
+```
+
+
+## License
+
+This firmware is distributed under Apache 2.0 license.
+

mos.yml

@@ -1,6 +1,6 @@
 author: 'Deomid "rojer" Ryabkov'
 description: A HomeKit firmware for Shelly switches
-version: 0.5.1
+version: 1.0.0
 platform: esp8266
 
 libs_version: ${mos.version}

src/shelly_sw_service.c

@@ -28,10 +28,24 @@ struct shelly_sw_service_ctx {
   const HAPAccessory *hap_accessory;
   const HAPService *hap_service;
   bool state;
+  int change_cnt;         // State change counter for reset.
+  double last_change_ts;  // Timestamp of last change (uptime).
 };
 
 static struct shelly_sw_service_ctx s_ctx[NUM_SWITCHES];
 
+static void do_reset(void *arg) {
+  struct shelly_sw_service_ctx *ctx = arg;
+  mgos_gpio_blink(ctx->cfg->out_gpio, 0, 0);
+  LOG(LL_INFO, ("Performing reset"));
+#ifdef MGOS_SYS_CONFIG_HAVE_WIFI
+  mgos_sys_config_set_wifi_sta_enable(false);
+  mgos_sys_config_set_wifi_ap_enable(true);
+  mgos_sys_config_save(&mgos_sys_config, false, NULL);
+  mgos_wifi_setup((struct mgos_config_wifi *) mgos_sys_config_get_wifi());
+#endif
+}
+
 static void shelly_sw_set_state_ctx(struct shelly_sw_service_ctx *ctx,
                                     bool new_state, const char *source) {
   const struct mgos_config_sw *cfg = ctx->cfg;
@@ -51,6 +65,20 @@ static void shelly_sw_set_state_ctx(struct shelly_sw_service_ctx *ctx,
     mgos_sys_config_save(&mgos_sys_config, false /* try_once */,
                          NULL /* msg */);
   }
+  double now = mgos_uptime();
+  if (now < 60) {
+    if (now - ctx->last_change_ts > 10) {
+      ctx->change_cnt = 0;
+    }
+    ctx->change_cnt++;
+    ctx->last_change_ts = now;
+    if (ctx->change_cnt >= 10) {
+      LOG(LL_INFO, ("Reset sequence detected"));
+      ctx->change_cnt = 0;
+      mgos_gpio_blink(cfg->out_gpio, 100, 100);
+      mgos_set_timer(600, 0, do_reset, ctx);
+    }
+  }
 }
 
 bool shelly_sw_set_state(int id, bool new_state, const char *source) {