[Michael Duggan (miduggan24)]

cherry-pick #1033

Summary

• Merge SensorManager and DataModelCallbacks into AppTask
• Create AppTaskImpl as CRTP base
• Streamline APIs per class diagram from design doc
• Add SensorConfig.h for user configurable endpoints

Related issues

MATTER-5950

Testing

CI (full run with smoke)
Local testing of overrides

[cursor]

PR Summary

Medium Risk
Large structural move of Matter cluster updates and attribute-change handling into AppTask; behavior should match prior SensorManager logic but regressions in reporting, occupancy toggle, or customer overrides are possible.

Overview
Refactors the Silabs multi-sensor example so sensor behavior lives in AppTask instead of separate SensorManager / DataModelCallbacks modules, and wires the app into the shared CustomerAppTask + AppTaskImpl CRTP override pattern.

AppTask now owns initialization, periodic reads, occupancy button handling, AttributeChangeListener posting for occupancy/temp/humidity, cluster getters, and the former Identify logging callback. The build drops SensorManager.cpp / DataModelCallbacks.cpp, adds CustomerAppTask.cpp, and exposes SensorConfig.h so occupancy, temperature, and humidity cluster endpoints are user-configurable. CHIP_SILABS_APP_USE_CUSTOMER_APP_TASK enables the customer task path; LCD code reads measurements via AppTask::GetAppTask() instead of SensorManager.

^{Reviewed by Cursor Bugbot for commit c10219e. Configure here.}

[sarthak shaha (Sarthak-Shaha)]

Should this be SL-TEMP in order to avoid merging it back to main?

[cursor]

Cursor Bugbot has reviewed your changes using default effort and found 2 potential issues.

Bugbot Autofix prepared fixes for both issues found in the latest run.

• ✅ Fixed: Wrong display enable macro used
  • Replaced all instances of #ifdef DISPLAY_ENABLED with #if SL_MATTER_DISPLAY_ENABLED to properly gate LCD code compilation.
• ✅ Fixed: Stale copyright year on new files
  • Updated copyright year from 2024 to 2026 in AppTaskImpl.h and SensorConfig.h to reflect their creation year.

Or push these changes by commenting:

@cursor push ee1826a976

Preview (ee1826a976)

diff --git a/examples/multi-sensor-app/silabs/include/AppTask.h b/examples/multi-sensor-app/silabs/include/AppTask.h
--- a/examples/multi-sensor-app/silabs/include/AppTask.h
+++ b/examples/multi-sensor-app/silabs/include/AppTask.h
@@ -142,7 +142,7 @@
      */
     bool IsOccupancyDetected();
 
-#ifdef DISPLAY_ENABLED
+#if SL_MATTER_DISPLAY_ENABLED
     /**
      * @brief LCD callback function to cycle LCD display.
      *        Function switch to the next LCD UI and update the show values.

diff --git a/examples/multi-sensor-app/silabs/include/AppTaskImpl.h b/examples/multi-sensor-app/silabs/include/AppTaskImpl.h
--- a/examples/multi-sensor-app/silabs/include/AppTaskImpl.h
+++ b/examples/multi-sensor-app/silabs/include/AppTaskImpl.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2024 Project CHIP Authors
+ *    Copyright (c) 2026 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/examples/multi-sensor-app/silabs/include/SensorConfig.h b/examples/multi-sensor-app/silabs/include/SensorConfig.h
--- a/examples/multi-sensor-app/silabs/include/SensorConfig.h
+++ b/examples/multi-sensor-app/silabs/include/SensorConfig.h
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2024 Project CHIP Authors
+ *    Copyright (c) 2026 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/examples/multi-sensor-app/silabs/src/AppTask.cpp b/examples/multi-sensor-app/silabs/src/AppTask.cpp
--- a/examples/multi-sensor-app/silabs/src/AppTask.cpp
+++ b/examples/multi-sensor-app/silabs/src/AppTask.cpp
@@ -54,7 +54,7 @@
 #include <crypto/RandUtils.h>
 #endif // defined(SL_MATTER_USE_SI70XX_SENSOR) && SL_MATTER_USE_SI70XX_SENSOR
 
-#if defined(DISPLAY_ENABLED) && DISPLAY_ENABLED
+#if SL_MATTER_DISPLAY_ENABLED
 #include <SensorsUI.h>
 #endif
 
@@ -225,7 +225,7 @@
         break;
     }
 }
-#endif // DISPLAY_ENABLED
+#endif // SL_MATTER_DISPLAY_ENABLED
 
 void AppTask::ButtonEventHandler(uint8_t button, uint8_t btnAction)
 {
@@ -302,9 +302,9 @@
     VerifyOrReturn(aEvent != nullptr);
     VerifyOrReturn(aEvent->Type == AppEvent::kEventType_SensorAttributeUpdate);
 
-#ifdef DISPLAY_ENABLED
+#if SL_MATTER_DISPLAY_ENABLED
     GetAppTask().UpdateSensorDisplay();
-#endif // DISPLAY_ENABLED
+#endif // SL_MATTER_DISPLAY_ENABLED
 }
 
 void AppTask::OccupancyAttributeUpdateEvent(AppEvent * aEvent)
@@ -314,9 +314,9 @@
 
     sOccupancyLed.Set(aEvent->OccupancyEvent.occupancyDetected);
 
-#ifdef DISPLAY_ENABLED
+#if SL_MATTER_DISPLAY_ENABLED
     GetAppTask().UpdateSensorDisplay();
-#endif // DISPLAY_ENABLED
+#endif // SL_MATTER_DISPLAY_ENABLED
 }
 
 void AppTask::TriggerSensorAction(chip::System::Layer * aLayer, void * aAppState)

_{You can send follow-ups to the cloud agent here.}

Comment @cursor review or bugbot run to trigger another review on this PR

^{Reviewed by Cursor Bugbot for commit c10219e. Configure here.}

[Michael Duggan (miduggan24)]

Should this be SL-TEMP in order to avoid merging it back to main?

good point, updated this and oven accordingly