fix detatched input

mongoose-os-apps · Jun 14, 2024 · 87a72ab · 87a72ab
1 parent 51cf40f
commit 87a72ab
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/ShellyPlus1/shelly_init.cpp b/src/ShellyPlus1/shelly_init.cpp
@@ -67,10 +67,10 @@ void CreateComponents(std::vector<std::unique_ptr<Component>> *comps,
                       HAPAccessoryServerRef *svr) {
   bool gdo_mode = mgos_sys_config_get_shelly_mode() == (int) Mode::kGarageDoor;
   bool ext_sensor_switch = (FindInput(2) != nullptr);
-  bool detatched_sensor =
-      (mgos_sys_config_get_sw1_in_mode() == (int) InMode::kDetached) &&
-      !gdo_mode && ext_sensor_switch;
-  bool single_accessory = sensors.empty() && !detatched_sensor;
+  bool addon_input = !gdo_mode && ext_sensor_switch;
+  bool single_accessory =
+      sensors.empty() && !addon_input &&
+      (mgos_sys_config_get_sw1_in_mode() != (int) InMode::kDetached);
   if (gdo_mode) {
     hap::CreateHAPGDO(1, FindInput(1), FindInput(2), FindOutput(1),
                       FindOutput(1), mgos_sys_config_get_gdo1(), comps, accs,
@@ -83,7 +83,7 @@ void CreateComponents(std::vector<std::unique_ptr<Component>> *comps,
   if (!sensors.empty()) {
     CreateHAPSensors(&sensors, comps, accs, svr);
   }
-  if (ext_sensor_switch && !gdo_mode) {
+  if (addon_input) {
     hap::CreateHAPInput(2, mgos_sys_config_get_in2(), comps, accs, svr);
   }
 }

diff --git a/src/ShellyPlus1PM/shelly_init.cpp b/src/ShellyPlus1PM/shelly_init.cpp
@@ -129,10 +129,10 @@ void CreateComponents(std::vector<std::unique_ptr<Component>> *comps,
                       HAPAccessoryServerRef *svr) {
   bool gdo_mode = mgos_sys_config_get_shelly_mode() == (int) Mode::kGarageDoor;
   bool ext_sensor_switch = (FindInput(2) != nullptr);
-  bool detatched_sensor =
-      (mgos_sys_config_get_sw1_in_mode() == (int) InMode::kDetached) &&
-      !gdo_mode && ext_sensor_switch;
-  bool single_accessory = sensors.empty() && !detatched_sensor;
+  bool addon_input = !gdo_mode && ext_sensor_switch;
+  bool single_accessory =
+      sensors.empty() && !addon_input &&
+      (mgos_sys_config_get_sw1_in_mode() != (int) InMode::kDetached);
   if (gdo_mode) {
     hap::CreateHAPGDO(1, FindInput(1), FindInput(2), FindOutput(1),
                       FindOutput(1), mgos_sys_config_get_gdo1(), comps, accs,
@@ -145,7 +145,7 @@ void CreateComponents(std::vector<std::unique_ptr<Component>> *comps,
   if (!sensors.empty()) {
     CreateHAPSensors(&sensors, comps, accs, svr);
   }
-  if (ext_sensor_switch && !gdo_mode) {
+  if (addon_input) {
     hap::CreateHAPInput(2, mgos_sys_config_get_in2(), comps, accs, svr);
   }
 }