From ceca377d7d59772f4d76dccad0c04a1cd4daf2ea Mon Sep 17 00:00:00 2001
From: Rohit <rohit.jadhav@espressif.com>
Date: Mon, 6 Apr 2026 15:46:12 +0530
Subject: [PATCH] [All-device-types-app] Fix endpoint hierarchy for composite
 devices

---
 .../all_device_types_app/main/esp_matter_console_helpers.cpp  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/examples/all_device_types_app/main/esp_matter_console_helpers.cpp b/examples/all_device_types_app/main/esp_matter_console_helpers.cpp
index cc02a0093..71f6c2c0d 100644
--- a/examples/all_device_types_app/main/esp_matter_console_helpers.cpp
+++ b/examples/all_device_types_app/main/esp_matter_console_helpers.cpp
@@ -402,6 +402,7 @@ int create(uint8_t device_type_index)
             ESP_LOGE(TAG, "Matter create endpoint failed");
             return 1;
         }
+        esp_matter::endpoint::set_parent_endpoint(tcc_endpoint, endpoint);
 
         break;
     }
@@ -417,6 +418,7 @@ int create(uint8_t device_type_index)
             ESP_LOGE(TAG, "Matter create endpoint failed");
             return 1;
         }
+        esp_matter::endpoint::set_parent_endpoint(tcc_endpoint, endpoint);
         break;
     }
     case ESP_MATTER_AIR_PURIFIER: {
@@ -465,6 +467,7 @@ int create(uint8_t device_type_index)
             ESP_LOGE(TAG, "Matter create endpoint failed");
             return 1;
         }
+        esp_matter::endpoint::set_parent_endpoint(ps_endpoint, endpoint);
         break;
     }
     case ESP_MATTER_WATER_LEAK_DETECTOR: {
@@ -551,6 +554,7 @@ int create(uint8_t device_type_index)
             ESP_LOGE(TAG, "Matter create endpoint failed");
             return 1;
         }
+        esp_matter::endpoint::set_parent_endpoint(ps_endpoint, endpoint);
         break;
     }
     case ESP_MATTER_MICROWAVE_OVEN: {