Skip to content

[SL-ONLY] Fixing the Zigbee app build failure - #1215

Merged
chirag-silabs merged 1 commit into
mainfrom
bugfix/fix_zigbee_app
Sep 28, 2026
Merged

chirag-silabs merged 1 commit into
mainfrom
bugfix/fix_zigbee_app

Conversation

@chirag-silabs

Copy link
Copy Markdown
Contributor

Summary

From the PR: #1207
The define check which was added was incorrect causing build failure
line https://github.com/SiliconLabsSoftware/matter_sdk/blob/main/examples/platform/silabs/BaseApplication.cpp#L1218

Related issues

NA

Testing

Local build of the zigbee app

@chirag-silabs
chirag-silabs requested a review from a team as a code owner September 28, 2026 04:57
@silabs-matter-ci-bot silabs-matter-ci-bot Bot added the sl-only This TAG indicates that this commit is a silabs-specific commit that cannot be upstreamed to CSA. label Sep 28, 2026
@cursor

cursor Bot commented Sep 28, 2026 •

Copy link
Copy Markdown

PR Summary

Low Risk
Single preprocessor guard change for a compile-time constant; no runtime behavior change beyond restoring successful Zigbee app builds.

Overview
Fixes a Silicon Labs Zigbee app build break by changing which preprocessor guard defines kZbLeaveAnnouceDelay in BaseApplication.cpp.

The delay constant was wrapped in #if SL_MATTER_ZIGBEE_SEQUENTIAL, but it is also used on the commissioning-complete path under #ifdef SL_CATALOG_ZIGBEE_STACK_COMMON_PRESENT. Zigbee app builds can have the catalog define without the sequential flag, so the symbol was missing and compilation failed.

The guard now matches SL_CATALOG_ZIGBEE_STACK_COMMON_PRESENT, consistent with other Zigbee includes and the timer use around commissioning.

Reviewed by Cursor Bugbot for commit 1ee857c. Configure here.

@chirag-silabs
chirag-silabs merged commit 2da74bd into main Sep 28, 2026
111 checks passed
@chirag-silabs
chirag-silabs deleted the bugfix/fix_zigbee_app branch September 28, 2026 11:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

sl-only This TAG indicates that this commit is a silabs-specific commit that cannot be upstreamed to CSA.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants