rgbw2: switch mode

fs_src/script.js

@@ -939,7 +939,6 @@ function updateElement(key, value, info) {
     case "model":
       if (value.endsWith("RGBW2")) {
         el("sys_mode_container").style.display = "block";
-        if (el("sys_mode_0")) el("sys_mode_0").remove();
       } else {
         if (el("sys_mode_3")) el("sys_mode_3").remove();
         if (el("sys_mode_4")) el("sys_mode_4").remove();

mos.yml

@@ -866,7 +866,7 @@ conds:
         # We don't use SSL, HomeKit uses its own crypto. This saves ~120K.
         MG_ENABLE_SSL: 0
       config_schema:
-        - ["shelly.mode", 3] # 3 - RGB, 4 - RGBW, 5 - RGB+W, 6 - CCT, 7 - White
+        - ["shelly.mode", 3] # 0 - Default (4 Switches), 3 - RGB, 4 - RGBW, 5 - RGB+W, 6 - CCT, 7 - White
         - ["device.id", "shellyrgbw2-??????"]
         - ["shelly.name", "shellyrgbw2-??????"]
         - ["wifi.ap.ssid", "shellyrgbw2-??????"]
@@ -880,6 +880,14 @@ conds:
         - ["in1", "in", {title: "Input 1 settings"}]
         - ["in1.ssw.name", "Shelly SSW1"]
         - ["in1.sensor.name", "Shelly S1"]
+        - ["sw1", "sw", {title: "SW1 settings"}]
+        - ["sw1.name", "Shelly SW1"]
+        - ["sw2", "sw", {title: "SW2 settings"}]
+        - ["sw2.name", "Shelly SW2"]
+        - ["sw3", "sw", {title: "SW3 settings"}]
+        - ["sw3.name", "Shelly SW3"]
+        - ["sw4", "sw", {title: "SW4 settings"}]
+        - ["sw4.name", "Shelly SW4"]
 
   - when: build_vars.MODEL == "ShellyUNI"
     apply:

src/ShellyRGBW2/shelly_init.cpp

@@ -68,6 +68,17 @@ void CreateComponents(std::vector<std::unique_ptr<Component>> *comps,
     ndev = 4;
   } else if (mode == (int) Mode::kRGBpW) {
     ndev = 2;
+  } else if (mode == (int) Mode::kDefault) {
+    CreateHAPSwitch(1, mgos_sys_config_get_sw1(), mgos_sys_config_get_in1(),
+                    comps, accs, svr, false /* to_pri_acc */);
+    CreateHAPSwitch(2, mgos_sys_config_get_sw2(), mgos_sys_config_get_in1(),
+                    comps, accs, svr, false /* to_pri_acc */);
+    CreateHAPSwitch(3, mgos_sys_config_get_sw3(), mgos_sys_config_get_in1(),
+                    comps, accs, svr, false /* to_pri_acc */);
+    CreateHAPSwitch(4, mgos_sys_config_get_sw4(), mgos_sys_config_get_in1(),
+                    comps, accs, svr, false /* to_pri_acc */);
+
+    return;
   }
 
   int out_pin = 1;