Match stock input mode settings

0 - Momentary, 1 - Toggle, 2 - Edge, 3 - Detached

We don't have "Activation" yet.

#1
#6

Author: rojer

fs/index.html

@@ -67,8 +67,13 @@ <h1 class="" id="sw1_name">SW1 Name</h1>
       <div class="form">
         <div class="">
           <div class="form-control">
-            <label>Push-button:</label>
-            <input type="checkbox" id="sw1_pushbutton">
+            <label>Mode:</label>
+            <select id="sw1_in_mode">
+              <option id="sw1_in_mode_0" value="0">Momentary</option>
+              <option id="sw1_in_mode_1" value="1">Toggle</option>
+              <option id="sw1_in_mode_2" value="2">Edge</option>
+              <option id="sw1_in_mode_3" value="3">Detached</option>
+            </select>
           </div>
           <div class="form-control">
             <label>Persist state:</label>
@@ -105,8 +110,13 @@ <h1 class="" id="sw2_name">SW2 Name</h1>
       <div class="form">
         <div class="">
           <div class="form-control">
-            <label>Push-button:</label>
-            <input type="checkbox" id="sw2_pushbutton">
+            <label>Mode:</label>
+            <select id="sw2_in_mode">
+              <option id="sw2_in_mode_0" value="0">Momentary</option>
+              <option id="sw2_in_mode_1" value="1">Toggle</option>
+              <option id="sw2_in_mode_2" value="2">Edge</option>
+              <option id="sw2_in_mode_3" value="3">Detached</option>
+            </select>
           </div>
           <div class="form-control">
             <label>Persist state:</label>
@@ -325,15 +335,15 @@ <h1 class="">Firmware</h1>
   );
 }
 
-function sw_save_common(cfg_key, pb, persist, spinner) {
+function sw_save_common(cfg_key, in_mode, persist, spinner) {
   spinner.className = "spin";
   var data = {
     config: {},
     save: true,
     reboot: false,
   };
   data.config[cfg_key] = {
-    in_push_button: pb,
+    in_mode: parseInt(in_mode),
     persist_state: persist,
   };
   axios.post(host + "/rpc/Config.Set", data).then(function(res) {
@@ -351,7 +361,7 @@ <h1 class="">Firmware</h1>
 document.getElementById("sw1_save_btn").onclick = function() {
   sw_save_common(
       "sw1",
-      document.getElementById("sw1_pushbutton").checked,
+      document.getElementById("sw1_in_mode").value,
       document.getElementById("sw1_persist").checked,
       document.getElementById("sw1_save_spinner"),
   );
@@ -360,7 +370,7 @@ <h1 class="">Firmware</h1>
 document.getElementById("sw2_save_btn").onclick = function() {
   sw_save_common(
       "sw2",
-      document.getElementById("sw2_pushbutton").checked,
+      document.getElementById("sw2_in_mode").value,
       document.getElementById("sw2_persist").checked,
       document.getElementById("sw2_save_spinner"),
   );
@@ -388,7 +398,7 @@ <h1 class="">Firmware</h1>
       document.getElementById("sw1_name").innerText = res.data.sw1.name;
       document.getElementById("sw1_state").innerText = (res.data.sw1.state ? "on" : "off");
       document.getElementById("sw1_btn_label").innerText = "Turn " + (res.data.sw1.state ? "Off" : "On");
-      document.getElementById("sw1_pushbutton").checked = res.data.sw1.pb;
+      document.getElementById("sw1_in_mode_" + res.data.sw1.in_mode).selected = true;
       document.getElementById("sw1_persist").checked = res.data.sw1.persist;
       document.getElementById("sw1_container").sw_id = res.data.sw1.id;
       document.getElementById("sw1_container").sw_state = res.data.sw1.state;
@@ -398,7 +408,7 @@ <h1 class="">Firmware</h1>
       document.getElementById("sw2_name").innerText = res.data.sw2.name;
       document.getElementById("sw2_state").innerText = (res.data.sw2.state ? "on" : "off");
       document.getElementById("sw2_btn_label").innerText = "Turn " + (res.data.sw2.state ? "Off" : "On");
-      document.getElementById("sw2_pushbutton").checked = res.data.sw2.pb;
+      document.getElementById("sw2_in_mode_" + res.data.sw2.in_mode).selected = true;
       document.getElementById("sw2_persist").checked = res.data.sw2.persist;
       document.getElementById("sw2_container").sw_id = res.data.sw2.id;
       document.getElementById("sw2_container").sw_state = res.data.sw2.state;

mos.yml

@@ -1,6 +1,6 @@
 author: 'Deomid "rojer" Ryabkov'
 description: A HomeKit firmware for Shelly switches
-version: 1.1.1
+version: 1.2.0
 platform: esp8266
 
 libs_version: ${mos.version}
@@ -26,7 +26,7 @@ config_schema:
   - ["sw.out_gpio", "i", -1, {"Output pin"}]
   - ["sw.out_on_value", "i", 1, {"Active (ON) output for gpio, 1 or 0"}]
   - ["sw.in_gpio", "i", -1, {"Input sensing pin"}]
-  - ["sw.in_push_button", "b", false, {"If true, every transition causes output to be toggled, otherwise output = input"}]
+  - ["sw.in_mode", "i", 1, {"0 - Momentary, 1 - Toggle, 2 - Edge, 3 - Detached"}]
   - ["sw.state", "b", false, {"State of the switch"}]
   - ["sw.persist_state", "b", false, {"Whether state of the switch should be persisted across reboots."}]
 

src/shelly_main.c

@@ -285,23 +285,23 @@ static void shelly_get_info_handler(struct mg_rpc_request_info *ri,
       ri,
       "{id: %Q, app: %Q, host: %Q, version: %Q, fw_build: %Q, "
 #ifdef MGOS_CONFIG_HAVE_SW1
-      "sw1: {id: %d, name: %Q, pb: %B, persist: %B, state: %B},"
+      "sw1: {id: %d, name: %Q, in_mode: %d, persist: %B, state: %B},"
 #endif
 #ifdef MGOS_CONFIG_HAVE_SW2
-      "sw2: {id: %d, name: %Q, pb: %B, persist: %B, state: %B},"
+      "sw2: {id: %d, name: %Q, in_mode: %d, persist: %B, state: %B},"
 #endif
       "wifi_en: %B, wifi_ssid: %Q, wifi_pass: %Q, "
       "hap_provisioned: %B, hap_paired: %B}",
       mgos_sys_config_get_device_id(), MGOS_APP, mgos_dns_sd_get_host_name(),
       mgos_sys_ro_vars_get_fw_version(), mgos_sys_ro_vars_get_fw_id(),
 #ifdef MGOS_CONFIG_HAVE_SW1
       mgos_sys_config_get_sw1_id(), mgos_sys_config_get_sw1_name(),
-      mgos_sys_config_get_sw1_in_push_button(),
+      mgos_sys_config_get_sw1_in_mode(),
       mgos_sys_config_get_sw1_persist_state(), sw1.state,
 #endif
 #ifdef MGOS_CONFIG_HAVE_SW2
       mgos_sys_config_get_sw2_id(), mgos_sys_config_get_sw2_name(),
-      mgos_sys_config_get_sw2_in_push_button(),
+      mgos_sys_config_get_sw2_in_mode(),
       mgos_sys_config_get_sw2_persist_state(), sw2.state,
 #endif
       mgos_sys_config_get_wifi_sta_enable(), (ssid ? ssid : ""),

src/shelly_sw_service.c

@@ -22,6 +22,13 @@
 #define IID_BASE 0x100
 #define IID_STEP 4
 
+enum shelly_sw_in_mode {
+  SHELLY_SW_IN_MODE_MOMENTARY = 0,
+  SHELLY_SW_IN_MODE_TOGGLE = 1,
+  SHELLY_SW_IN_MODE_EDGE = 2,
+  SHELLY_SW_IN_MODE_DETACHED = 3,
+};
+
 struct shelly_sw_service_ctx {
   const struct mgos_config_sw *cfg;
   HAPAccessoryServerRef *hap_server;
@@ -205,12 +212,21 @@ static const HAPCharacteristic *shelly_sw_on_char(uint16_t iid) {
 static void shelly_sw_in_cb(int pin, void *arg) {
   struct shelly_sw_service_ctx *ctx = arg;
   bool in_state = mgos_gpio_read(pin);
-  if (ctx->cfg->in_push_button) {
-    if (in_state) {  // Only on 0 -> 1 transitions.
+  switch ((enum shelly_sw_in_mode) ctx->cfg->in_mode) {
+    case SHELLY_SW_IN_MODE_MOMENTARY:
+      if (in_state) {  // Only on 0 -> 1 transitions.
+        shelly_sw_set_state_ctx(ctx, !ctx->state, "button");
+      }
+      break;
+    case SHELLY_SW_IN_MODE_TOGGLE:
+      shelly_sw_set_state_ctx(ctx, in_state, "switch");
+      break;
+    case SHELLY_SW_IN_MODE_EDGE:
       shelly_sw_set_state_ctx(ctx, !ctx->state, "button");
-    }
-  } else {
-    shelly_sw_set_state_ctx(ctx, in_state, "switch");
+      break;
+    case SHELLY_SW_IN_MODE_DETACHED:
+      // Nothing to do
+      break;
   }
   (void) pin;
 }
@@ -248,7 +264,7 @@ HAPService *shelly_sw_service_create(const struct mgos_config_sw *cfg) {
   mgos_gpio_set_button_handler(cfg->in_gpio, MGOS_GPIO_PULL_NONE,
                                MGOS_GPIO_INT_EDGE_ANY, 20, shelly_sw_in_cb,
                                ctx);
-  if (!ctx->cfg->in_push_button) {
+  if (ctx->cfg->in_mode == SHELLY_SW_IN_MODE_TOGGLE) {
     shelly_sw_in_cb(cfg->in_gpio, ctx);
   }
   return svc;