Merge branch 'fix_generic_switch_feature_check_for_1_4' into 'release…

…/v1.4' [v1.4]backport: components/esp-matter: fix generic switch feature check error See merge request app-frameworks/esp-matter!1006
espressif · Jan 8, 2025 · 22e612f · 22e612f
2 parents 21913af + d456ac1
commit 22e612f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/components/esp_matter/esp_matter_feature.cpp b/components/esp_matter/esp_matter_feature.cpp
@@ -2805,7 +2805,7 @@ esp_err_t add(cluster_t *cluster)
     uint32_t as_feature_map = feature::action_switch::get_id();
     uint32_t ms_feature_map = feature::momentary_switch::get_id();
     uint32_t feature_map = get_feature_map_value(cluster);
-    VerifyOrReturnError(((feature_map & ms_feature_map) != ms_feature_map) || ((feature_map & as_feature_map) == as_feature_map), ESP_ERR_NOT_SUPPORTED, ESP_LOGE(TAG, "Momentary switch release is not supported."));
+    VerifyOrReturnError(((feature_map & ms_feature_map) == ms_feature_map) && ((feature_map & as_feature_map) != as_feature_map), ESP_ERR_NOT_SUPPORTED, ESP_LOGE(TAG, "Momentary switch release is not supported."));
     update_feature_map(cluster, get_id());
 
     event::create_short_release(cluster);
@@ -2827,8 +2827,8 @@ esp_err_t add(cluster_t *cluster)
     uint32_t as_feature_map = feature::action_switch::get_id();
     uint32_t ms_feature_map = feature::momentary_switch::get_id();
     uint32_t feature_map = get_feature_map_value(cluster);
-    VerifyOrReturnError((feature_map & ms_feature_map) != ms_feature_map, ESP_ERR_NOT_SUPPORTED, ESP_LOGE(TAG, "Momentary switch long press is not supported."));
-    VerifyOrReturnError(((feature_map & msr_feature_map) != msr_feature_map) && ((feature_map & as_feature_map) != as_feature_map), ESP_ERR_NOT_SUPPORTED, ESP_LOGE(TAG, "Momentary switch long press is not supported."));
+    VerifyOrReturnError((feature_map & ms_feature_map) == ms_feature_map, ESP_ERR_NOT_SUPPORTED, ESP_LOGE(TAG, "Momentary switch long press is not supported."));
+    VerifyOrReturnError(((feature_map & msr_feature_map) == msr_feature_map) || ((feature_map & as_feature_map) == as_feature_map), ESP_ERR_NOT_SUPPORTED, ESP_LOGE(TAG, "Momentary switch long press is not supported."));
     update_feature_map(cluster, get_id());
 
     event::create_long_press(cluster);