Skip to content

[all-device-app] Add OTA Requestor device type to RootNode (backport #73879) #74038

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

Open
mergify wants to merge 1 commit into
base: v1.7-branch
Choose a base branch
from
+28 −3
Open

[all-device-app] Add OTA Requestor device type to RootNode (backport #73879) #74038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions examples/all-devices-app/all-devices-common/device/types/root-node/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import("//build_overrides/build.gni")
import("//build_overrides/chip.gni")
import("${chip_root}/src/platform/device.gni")

source_set("root-node") {
sources = [
Expand All @@ -38,6 +39,10 @@ source_set("root-node") {
"${chip_root}/src/lib/support",
"${chip_root}/zzz_generated/app-common/devices/",
]

if (chip_enable_ota_requestor) {
public_deps += [ "${chip_root}/zzz_generated/app-common/clusters/OtaSoftwareUpdateProvider:ids" ]
}
}

source_set("wifi") {
Expand Down
12 changes: 12 additions & 0 deletions examples/all-devices-app/all-devices-common/device/types/root-node/RootNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,25 @@
#include <lib/support/CodeUtils.h>
#include <platform/CHIPDeviceLayer.h>

#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
#include <clusters/OtaSoftwareUpdateProvider/ClusterId.h>
#endif // CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR

using namespace chip;
using namespace chip::app;
using namespace chip::app::Clusters;
using namespace chip::DeviceLayer;
namespace chip {
namespace app {

#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
CHIP_ERROR RootNode::ClientClusters(ReadOnlyBufferBuilder<ClusterId> & out) const
{
static constexpr ClusterId kClientClusters[] = { OtaSoftwareUpdateProvider::Id };
return out.ReferenceExisting(Span<const ClusterId>(kClientClusters));
}
#endif // CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR

CHIP_ERROR RootNode::Register(EndpointId endpointId, CodeDrivenDataModelProvider & provider, EndpointComposition composition)
{
composition.pattern = DataModel::EndpointCompositionPattern::kFullFamily;
Expand Down
14 changes: 11 additions & 3 deletions examples/all-devices-app/all-devices-common/device/types/root-node/RootNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,22 +67,30 @@ class RootNode : public SingleEndpoint
#endif // CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
};

RootNode(const Context & context) :
SingleEndpoint(Span<const DataModel::DeviceTypeEntry>(&Device::Type::kRootNode, 1)), mContext(context)
{}
RootNode(const Context & context) : SingleEndpoint(Span<const DataModel::DeviceTypeEntry>(kDeviceTypes)), mContext(context) {}
~RootNode() override = default;

CHIP_ERROR Register(EndpointId endpoint, CodeDrivenDataModelProvider & provider, EndpointComposition composition = {}) override;
void Unregister(CodeDrivenDataModelProvider & provider) override;

Clusters::BasicInformationCluster & BasicInformation() { return mBasicInformationCluster.Cluster(); }

#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
CHIP_ERROR ClientClusters(ReadOnlyBufferBuilder<ClusterId> & out) const override;
#endif // CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR

protected:
Context mContext;

LazyRegisteredServerCluster<Clusters::GeneralCommissioningCluster> mGeneralCommissioningCluster;

private:
#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
static constexpr DataModel::DeviceTypeEntry kDeviceTypes[] = { Device::Type::kRootNode, Device::Type::kOtaRequestor };
#else
static constexpr DataModel::DeviceTypeEntry kDeviceTypes[] = { Device::Type::kRootNode };
#endif // CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR

LazyRegisteredServerCluster<Clusters::BasicInformationCluster> mBasicInformationCluster;
LazyRegisteredServerCluster<Clusters::AdministratorCommissioningWithBasicCommissioningWindowCluster>
mAdministratorCommissioningCluster;
Expand Down
Loading