Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ICD] Set MaximumCheckInBackOff to external and fix define guards for unit test members #36223

Merged
merged 3 commits into from
Oct 24, 2024
Merged

[ICD] Set MaximumCheckInBackOff to external and fix define guards for unit test members #36223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf2bddb
Fix ICD manager and attributes
mkardous-silabs Oct 23, 2024
a6183dc
Generated files
mkardous-silabs Oct 23, 2024
2eefa5f
zap regen
mkardous-silabs Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/app/icd/server/ICDManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ void ICDManager::Shutdown()
bool ICDManager::SupportsFeature(Feature feature)
{
// Can't use attribute accessors/Attributes::FeatureMap::Get in unit tests
#if !CONFIG_BUILD_FOR_HOST_UNIT_TEST
#if !(CONFIG_BUILD_FOR_HOST_UNIT_TEST)
uint32_t featureMap = 0;
bool success = (Attributes::FeatureMap::Get(kRootEndpointId, &featureMap) == Status::Success);
return success ? ((featureMap & to_underlying(feature)) != 0) : false;
#else
return ((mFeatureMap & to_underlying(feature)) != 0);
#endif // !CONFIG_BUILD_FOR_HOST_UNIT_TEST
#endif // !(CONFIG_BUILD_FOR_HOST_UNIT_TEST)
}

uint32_t ICDManager::StayActiveRequest(uint32_t stayActiveDuration)
Expand All @@ -145,7 +145,7 @@ uint32_t ICDManager::StayActiveRequest(uint32_t stayActiveDuration)
#if CHIP_CONFIG_ENABLE_ICD_CIP
void ICDManager::SendCheckInMsgs()
{
#if !CONFIG_BUILD_FOR_HOST_UNIT_TEST
#if !(CONFIG_BUILD_FOR_HOST_UNIT_TEST)
VerifyOrDie(mStorage != nullptr);
VerifyOrDie(mFabricTable != nullptr);

Expand Down Expand Up @@ -213,7 +213,7 @@ void ICDManager::SendCheckInMsgs()
}
}
}
#endif // CONFIG_BUILD_FOR_HOST_UNIT_TEST
#endif // !(CONFIG_BUILD_FOR_HOST_UNIT_TEST)
}

bool ICDManager::CheckInMessagesWouldBeSent(const std::function<ShouldCheckInMsgsBeSentFunction> & shouldCheckInMsgsBeSentFunction)
Expand Down Expand Up @@ -396,7 +396,7 @@ void ICDManager::UpdateICDMode()
ICDConfigurationData::GetInstance().SetICDMode(tempMode);

// Can't use attribute accessors/Attributes::OperatingMode::Set in unit tests
#if !CONFIG_BUILD_FOR_HOST_UNIT_TEST
#if !(CONFIG_BUILD_FOR_HOST_UNIT_TEST)
Attributes::OperatingMode::Set(kRootEndpointId, static_cast<OperatingModeEnum>(tempMode));
#endif

Expand Down
6 changes: 3 additions & 3 deletions src/app/icd/server/ICDManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ class ICDManager : public ICDListener, public TestEventTriggerHandler
#if CHIP_CONFIG_PERSIST_SUBSCRIPTIONS && !CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION
bool GetIsBootUpResumeSubscriptionExecuted() { return mIsBootUpResumeSubscriptionExecuted; };
#endif // !CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION && CHIP_CONFIG_PERSIST_SUBSCRIPTIONS
#endif
#endif // CONFIG_BUILD_FOR_HOST_UNIT_TEST

// Implementation of ICDListener functions.
// Callers must origin from the chip task context or hold the ChipStack lock.
Expand Down Expand Up @@ -382,10 +382,10 @@ class ICDManager : public ICDListener, public TestEventTriggerHandler
ObjectPool<ICDCheckInSender, (CHIP_CONFIG_ICD_CLIENTS_SUPPORTED_PER_FABRIC * CHIP_CONFIG_MAX_FABRICS)> mICDSenderPool;
#endif // CHIP_CONFIG_ENABLE_ICD_CIP

#ifdef CONFIG_BUILD_FOR_HOST_UNIT_TEST
#if CONFIG_BUILD_FOR_HOST_UNIT_TEST
// feature map that can be changed at runtime for testing purposes
uint32_t mFeatureMap = 0;
#endif
#endif // CONFIG_BUILD_FOR_HOST_UNIT_TEST
};

} // namespace app
Expand Down
3 changes: 2 additions & 1 deletion src/app/zap-templates/zcl/zcl-with-test-extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,8 @@
"ActiveModeThreshold",
"RegisteredClients",
"ICDCounter",
"ClientsSupportedPerFabric"
"ClientsSupportedPerFabric",
"MaximumCheckInBackOff"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MaximumCheckInBackOff is tagged as apiMaturity="provisional" - should it be here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is this set? I'm not familiar with the apiMaturity tag

Copy link
Contributor

@gmarcosb gmarcosb Nov 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@

connectedhomeip/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml

Line 154 in 73ff58f

<attribute side="server" code="0x09" name="MaximumCheckInBackOff" define="MAXIMUM_CHECK_IN_BACK_OFF" type="int32u" default="1" max="64800" optional="true" apiMaturity="provisional">

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MaximumCheckInBackOff is tagged as apiMaturity="provisional" - should it be here?

@gmarcosb apiMaturity has absolutely nothing to do with whether things are listed in the JSON metadata.

],
"Occupancy Sensing": ["HoldTimeLimits", "HoldTime", "FeatureMap"],
"Operational Credentials": [
Expand Down
3 changes: 2 additions & 1 deletion src/app/zap-templates/zcl/zcl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,8 @@
"ActiveModeThreshold",
"RegisteredClients",
"ICDCounter",
"ClientsSupportedPerFabric"
"ClientsSupportedPerFabric",
"MaximumCheckInBackOff"
],
"Occupancy Sensing": ["HoldTimeLimits", "HoldTime", "FeatureMap"],
"Operational Credentials": [
Expand Down
47 changes: 0 additions & 47 deletions zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading