Pull request project-chip#1627: MATTER-3232 Refactored ICD defines within AppTask.cpp of sensor,on-off plug, sl-newlight

CuRahman · jmartinez-silabs · commit 6ea7d21b8669 · 2024-03-27T08:44:21.000-04:00
Merge in WMN_TOOLS/matter from bugfix/sensor_power_consumption to silabs

Squashed commit of the following:

commit 3538f7ee78452a5785a45059f9d91e2a5917ef0f
Author: Curtis Rahman &lt;curtis.rahman@silabs.com&gt;
Date:   Fri Mar 8 13:04:35 2024 -0500

    Updated refactored ICD defines within AppTask.cpp of sensor,on-off plug, sl-newlight
diff --git a/silabs_examples/onoff-plug-app/src/AppTask.cpp b/silabs_examples/onoff-plug-app/src/AppTask.cpp
@@ -125,7 +125,7 @@ void AppTask::AppTaskMain(void * pvParameter)
         appError(err);
     }
 
-#if !(defined(CHIP_DEVICE_CONFIG_ENABLE_SED) && CHIP_DEVICE_CONFIG_ENABLE_SED)
+#if !(defined(CHIP_CONFIG_ENABLE_ICD_SERVER) && CHIP_CONFIG_ENABLE_ICD_SERVER)
     sAppTask.StartStatusLEDTimer();
 #endif
 
diff --git a/silabs_examples/silabs-sensors/src/AppTask.cpp b/silabs_examples/silabs-sensors/src/AppTask.cpp
@@ -115,7 +115,7 @@ void AppTask::AppTaskMain(void * pvParameter)
         appError(err);
     }
 
-#if !(defined(CHIP_DEVICE_CONFIG_ENABLE_SED) && CHIP_DEVICE_CONFIG_ENABLE_SED)
+#if !(defined(CHIP_CONFIG_ENABLE_ICD_SERVER) && CHIP_CONFIG_ENABLE_ICD_SERVER)
     sAppTask.StartStatusLEDTimer();
 #endif
 
diff --git a/silabs_examples/sl-newLight/efr32/src/AppTask.cpp b/silabs_examples/sl-newLight/efr32/src/AppTask.cpp
@@ -132,7 +132,7 @@ void AppTask::AppTaskMain(void * pvParameter)
         appError(err);
     }
 
-#if !(defined(CHIP_DEVICE_CONFIG_ENABLE_SED) && CHIP_DEVICE_CONFIG_ENABLE_SED)
+#if !(defined(CHIP_CONFIG_ENABLE_ICD_SERVER) && CHIP_CONFIG_ENABLE_ICD_SERVER)
     sAppTask.StartStatusLEDTimer();
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ void AppTask::AppTaskMain(void * pvParameter)`
`125`	`125`	`appError(err);`
`126`	`126`	`}`
`127`	`127`
`128`		`-#if !(defined(CHIP_DEVICE_CONFIG_ENABLE_SED) && CHIP_DEVICE_CONFIG_ENABLE_SED)`
	`128`	`+#if !(defined(CHIP_CONFIG_ENABLE_ICD_SERVER) && CHIP_CONFIG_ENABLE_ICD_SERVER)`
`129`	`129`	`sAppTask.StartStatusLEDTimer();`
`130`	`130`	`#endif`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ void AppTask::AppTaskMain(void * pvParameter)`
`115`	`115`	`appError(err);`
`116`	`116`	`}`
`117`	`117`
`118`		`-#if !(defined(CHIP_DEVICE_CONFIG_ENABLE_SED) && CHIP_DEVICE_CONFIG_ENABLE_SED)`
	`118`	`+#if !(defined(CHIP_CONFIG_ENABLE_ICD_SERVER) && CHIP_CONFIG_ENABLE_ICD_SERVER)`
`119`	`119`	`sAppTask.StartStatusLEDTimer();`
`120`	`120`	`#endif`
`121`	`121`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ void AppTask::AppTaskMain(void * pvParameter)`
`132`	`132`	`appError(err);`
`133`	`133`	`}`
`134`	`134`
`135`		`-#if !(defined(CHIP_DEVICE_CONFIG_ENABLE_SED) && CHIP_DEVICE_CONFIG_ENABLE_SED)`
	`135`	`+#if !(defined(CHIP_CONFIG_ENABLE_ICD_SERVER) && CHIP_CONFIG_ENABLE_ICD_SERVER)`
`136`	`136`	`sAppTask.StartStatusLEDTimer();`
`137`	`137`	`#endif`
`138`	`138`