Skip to content

Commit dff0492

Browse files
committed
Pull request project-chip#1822: [Cherry-pick] Added [[maybe_unused]] to remove errors from NDEBUG builds (project-chip#33315)
Merge in WMN_TOOLS/matter from cherry-pick/no_debug_build_fix to silabs_slc_1.3 Squashed commit of the following: commit 393d82919c6208e785f2d5b724de08ff75c8a9b7 Author: Curtis Rahman <curtis.rahman@silabs.com> Date: Tue May 7 15:54:54 2024 -0400 Added light-switch to no debug builds commit b5b0bf2fcbe72bc53c5a9531360c43f6ecf74523 Author: Curtis Rahman <111998767+CuRahman@users.noreply.github.com> Date: Mon May 6 21:54:43 2024 -0400 [Silabs] Added [[maybe_unused]] to remove errors from NDEBUG builds (project-chip#33315) * Added NDEBUG ifndef to minimize code size * Restyled by whitespace * Restyled by clang-format * Added #endif * Added [[mayne_unused]] --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 7ac0300 commit dff0492

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

examples/light-switch-app/silabs/src/ZclCallbacks.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ using namespace ::chip::app::Clusters;
3333
void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
3434
uint8_t * value)
3535
{
36-
ClusterId clusterId = attributePath.mClusterId;
37-
AttributeId attributeId = attributePath.mAttributeId;
36+
ClusterId clusterId = attributePath.mClusterId;
37+
[[maybe_unused]] AttributeId attributeId = attributePath.mAttributeId;
3838
ChipLogProgress(Zcl, "Cluster callback: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
3939

4040
if (clusterId == OnOffSwitchConfiguration::Id)

examples/lock-app/silabs/src/ZclCallbacks.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath &
4848

4949
if (clusterId == DoorLock::Id && attributeId == DoorLock::Attributes::LockState::Id)
5050
{
51-
DoorLock::DlLockState lockState = *(reinterpret_cast<DoorLock::DlLockState *>(value));
51+
[[maybe_unused]] DoorLock::DlLockState lockState = *(reinterpret_cast<DoorLock::DlLockState *>(value));
5252
ChipLogProgress(Zcl, "Door lock cluster: " ChipLogFormatMEI " state %d", ChipLogValueMEI(clusterId),
5353
to_underlying(lockState));
5454
#ifdef DIC_ENABLE

jenkins/jenkinsFunctions.groovy

+7-5
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,13 @@ def testCopyContents(){
170170
def buildNoDebugImages(){
171171
def componentsToRemove = '--without "matter_shell;matter,matter_qr_code;matter,matter_lcd;matter"'
172172
def appsToBuild = []
173-
appsToBuild += getBuildConfigs(board="BRD4187C", appName="lighting-app", otaVersion="", ncp = "", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")
174-
appsToBuild += getBuildConfigs(board="BRD4187C", appName="lock-app", otaVersion="", ncp = "", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")
175-
appsToBuild += getBuildConfigs(board="BRD4187C", appName="window-app", otaVersion="", ncp = "", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")
176-
appsToBuild += getBuildConfigs(board="BRD4187C", appName="lock-app", otaVersion="", ncp = "rs911x", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")
177-
appsToBuild += getBuildConfigs(board="BRD4187C", appName="thermostat", otaVersion="", ncp = "rs911x", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")
173+
appsToBuild += getBuildConfigs(board="BRD4187C", appName="lighting-app", otaVersion="", ncp = "", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")
174+
appsToBuild += getBuildConfigs(board="BRD4187C", appName="light-switch-app", otaVersion="", ncp = "", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")
175+
appsToBuild += getBuildConfigs(board="BRD4187C", appName="lock-app", otaVersion="", ncp = "", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")
176+
appsToBuild += getBuildConfigs(board="BRD4187C", appName="window-app", otaVersion="", ncp = "", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")
177+
appsToBuild += getBuildConfigs(board="BRD4187C", appName="dishwasher-app", otaVersion="", ncp = "", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")
178+
appsToBuild += getBuildConfigs(board="BRD4187C", appName="lock-app", otaVersion="", ncp = "rs911x", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")
179+
appsToBuild += getBuildConfigs(board="BRD4187C", appName="thermostat", otaVersion="", ncp = "rs911x", configs = componentsToRemove, useWorkspace = false, additionalComponents = ",matter_no_debug;matter")
178180
slcBuild(appsToBuild, "No Debug")
179181
}
180182
def buildOtaImages(){

0 commit comments

Comments
 (0)