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

Remove includes of CHIPClusters.h in Darwin code. #26635

Merged
merged 1 commit into from
May 17, 2023
Merged

Remove includes of CHIPClusters.h in Darwin code. #26635

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
1 change: 0 additions & 1 deletion src/darwin/Framework/CHIP/MTRCluster_Internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#import "MTRBaseDevice_Internal.h"
#import "MTRCluster.h"

#import "zap-generated/CHIPClusters.h"
#import "zap-generated/MTRBaseClusters.h"

#include <app/ReadPrepareParams.h>
Expand Down
4 changes: 3 additions & 1 deletion src/darwin/Framework/CHIP/templates/MTRBaseClusters-src.zapt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
#import "MTRDevice_Internal.h"
#import "MTRStructsObjc.h"

#include <controller/CHIPCluster.h>
#include <lib/support/CHIPListUtils.h>
#include <platform/CHIPDeviceLayer.h>

#include <type_traits>

using chip::Callback::Callback;
Expand Down Expand Up @@ -194,7 +196,7 @@ MTR{{cluster}}Cluster{{command}}Params
TypeInfo::Type cppValue;
{{>encode_value target="cppValue" source="value" cluster=parent.name errorCode="return CHIP_ERROR_INVALID_ARGUMENT;" depth=0}}

chip::Controller::{{asUpperCamelCase parent.name}}Cluster cppCluster(exchangeManager, session, self->_endpoint);
chip::Controller::ClusterBase cppCluster(exchangeManager, session, self->_endpoint);
return cppCluster.WriteAttribute<TypeInfo>(cppValue, bridge, successCb, failureCb, timedWriteTimeout);
});
std::move(*bridge).DispatchAction(self.device);
Expand Down
2 changes: 0 additions & 2 deletions src/darwin/Framework/CHIP/templates/MTRBaseClusters_Internal.zapt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
#import "MTRBaseClusters.h"
#import "MTRBaseDevice.h"

#include <zap-generated/CHIPClusters.h>

{{#zcl_clusters}}

{{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
Expand Down
2 changes: 0 additions & 2 deletions src/darwin/Framework/CHIP/templates/MTRClusters_Internal.zapt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
#import "MTRDevice.h"
#import "MTRDevice_Internal.h"

#include <zap-generated/CHIPClusters.h>

{{#zcl_clusters}}

{{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
Expand Down
452 changes: 227 additions & 225 deletions src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_Internal.h
View file
Open in desktop

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

2 changes: 0 additions & 2 deletions src/darwin/Framework/CHIP/zap-generated/MTRClusters_Internal.h
View file
Open in desktop

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