Skip to content

Commit

Permalink
Pull request project-chip#1640: Pull request project-chip#1627: MATTE…
Browse files Browse the repository at this point in the history
…R-3232 Refactored ICD defines within AppTask.cpp of sensor,on-off plug, sl-newlight

Merge in WMN_TOOLS/matter from cherry-pick/sensor_icd to RC_2.3.0-1.3-alpha.3

Squashed commit of the following:

commit 0309b0949a935f2cbf138af12f4b1fb6d5ea6e36
Author: Curtis Rahman <[email protected]>
Date:   Wed Mar 13 20:32:16 2024 +0000

    Pull request project-chip#1631: MATTER-3232  ICD consumption Follow-up

    Merge in WMN_TOOLS/matter from bugfix/icd_consumption_followup to silabs

    Squashed commit of the following:

    commit d78d7afecb669362013822d0321dacf410ca0b31
    Author: Curtis Rahman <[email protected]>
    Date:   Fri Mar 8 15:56:36 2024 -0500

        Updated template ICD defines

commit d877165f26ba40cf82c9062780cb19ef281a1996
Author: Curtis Rahman <[email protected]>
Date:   Fri Mar 8 18:35:22 2024 +0000

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

    Merge in WMN_TOOLS/matter from bugfix/sensor_power_consumption to silabs

    Squashed commit of the following:

    commit 3538f7ee78452a5785a45059f9d91e2a5917ef0f
    Author: Curtis Rahman <[email protected]>
    Date:   Fri Mar 8 13:04:35 2024 -0500

        Updated refactored ICD defines within AppTask.cpp of sensor,on-off plug, sl-newlight
  • Loading branch information
CuRahman authored and mkardous-silabs committed Mar 13, 2024
1 parent 1222f2d commit 213496e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion silabs_examples/onoff-plug-app/src/AppTask.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion silabs_examples/silabs-sensors/src/AppTask.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion silabs_examples/sl-newLight/efr32/src/AppTask.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion silabs_examples/template/src/AppTask.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,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

Expand Down

0 comments on commit 213496e

Please sign in to comment.