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.

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

Darwin base chip cluster #4883

Merged
merged 4 commits into from
Feb 24, 2021
Merged
Changes from all commits
Commits
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
622 changes: 291 additions & 331 deletions examples/all-clusters-app/all-clusters-common/gen/CHIPClustersObjc.h

Large diffs are not rendered by default.

3,302 changes: 1,679 additions & 1,623 deletions examples/all-clusters-app/all-clusters-common/gen/CHIPClustersObjc.mm

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions examples/bridge-app/bridge-common/bridge-app.zap
Original file line number Diff line number Diff line change
@@ -3918,23 +3918,23 @@
"code": 64,
"mfgCode": null,
"source": "client",
"incoming": 1,
"incoming": 0,
"outgoing": 0
},
{
"name": "OnWithRecallGlobalScene",
"code": 65,
"mfgCode": null,
"source": "client",
"incoming": 1,
"incoming": 0,
"outgoing": 0
},
{
"name": "OnWithTimedOff",
"code": 66,
"mfgCode": null,
"source": "client",
"incoming": 1,
"incoming": 0,
"outgoing": 0
}
],
@@ -5419,4 +5419,4 @@
"networkId": 0
}
]
}
}
148 changes: 77 additions & 71 deletions examples/bridge-app/bridge-common/gen/CHIPClustersObjc.h
Original file line number Diff line number Diff line change
@@ -22,122 +22,128 @@

#import <Foundation/Foundation.h>

typedef void (^ResponseHandler)(NSError * _Nullable error, NSDictionary * _Nullable values);

@class CHIPDevice;

typedef void (^ResponseHandler)(NSError * _Nullable error, NSDictionary * _Nullable values);

NS_ASSUME_NONNULL_BEGIN

@interface CHIPBasic : NSObject

- (nullable instancetype)initWithDevice:(CHIPDevice *)device endpoint:(uint8_t)endpoint queue:(dispatch_queue_t)queue;
- (BOOL)resetToFactoryDefaults:(ResponseHandler)completionHandler;

- (BOOL)readAttributeZclVersion:(ResponseHandler)completionHandler;
- (BOOL)readAttributeApplicationVersion:(ResponseHandler)completionHandler;
- (BOOL)readAttributeStackVersion:(ResponseHandler)completionHandler;
- (BOOL)readAttributeHardwareVersion:(ResponseHandler)completionHandler;
- (BOOL)readAttributeManufacturerName:(ResponseHandler)completionHandler;
- (BOOL)readAttributeModelIdentifier:(ResponseHandler)completionHandler;
- (BOOL)readAttributeDateCode:(ResponseHandler)completionHandler;
- (BOOL)readAttributePowerSource:(ResponseHandler)completionHandler;
- (BOOL)readAttributeGenericDeviceClass:(ResponseHandler)completionHandler;
- (BOOL)readAttributeGenericDeviceType:(ResponseHandler)completionHandler;
- (BOOL)readAttributeProductCode:(ResponseHandler)completionHandler;
- (BOOL)readAttributeProductUrl:(ResponseHandler)completionHandler;
- (BOOL)readAttributeSwBuildId:(ResponseHandler)completionHandler;
- (BOOL)readAttributeClusterRevision:(ResponseHandler)completionHandler;
/**
* CHIPCluster
* This is the base class for clusters.
*/
@interface CHIPCluster : NSObject

- (nullable instancetype)initWithDevice:(CHIPDevice *)device
endpoint:(uint8_t)endpoint
queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER;
- (instancetype)init NS_UNAVAILABLE;
+ (instancetype)new NS_UNAVAILABLE;

@end

NS_ASSUME_NONNULL_END
/**
* Cluster Basic
*
*/
@interface CHIPBasic : CHIPCluster

- (void)resetToFactoryDefaults:(ResponseHandler)completionHandler;

- (void)readAttributeZclVersion:(ResponseHandler)completionHandler;
- (void)readAttributeApplicationVersion:(ResponseHandler)completionHandler;
- (void)readAttributeStackVersion:(ResponseHandler)completionHandler;
- (void)readAttributeHardwareVersion:(ResponseHandler)completionHandler;
- (void)readAttributeManufacturerName:(ResponseHandler)completionHandler;
- (void)readAttributeModelIdentifier:(ResponseHandler)completionHandler;
- (void)readAttributeDateCode:(ResponseHandler)completionHandler;
- (void)readAttributePowerSource:(ResponseHandler)completionHandler;
- (void)readAttributeGenericDeviceClass:(ResponseHandler)completionHandler;
- (void)readAttributeGenericDeviceType:(ResponseHandler)completionHandler;
- (void)readAttributeProductCode:(ResponseHandler)completionHandler;
- (void)readAttributeProductUrl:(ResponseHandler)completionHandler;
- (void)readAttributeSwBuildId:(ResponseHandler)completionHandler;
- (void)readAttributeClusterRevision:(ResponseHandler)completionHandler;

NS_ASSUME_NONNULL_BEGIN
@end

@interface CHIPLevelControl : NSObject
/**
* Cluster Level Control
*
*/
@interface CHIPLevelControl : CHIPCluster

- (nullable instancetype)initWithDevice:(CHIPDevice *)device endpoint:(uint8_t)endpoint queue:(dispatch_queue_t)queue;
- (BOOL)move:(uint8_t)moveMode
- (void)move:(uint8_t)moveMode
rate:(uint8_t)rate
optionMask:(uint8_t)optionMask
optionOverride:(uint8_t)optionOverride
completionHandler:(ResponseHandler)completionHandler;
- (BOOL)moveToLevel:(uint8_t)level
- (void)moveToLevel:(uint8_t)level
transitionTime:(uint16_t)transitionTime
optionMask:(uint8_t)optionMask
optionOverride:(uint8_t)optionOverride
completionHandler:(ResponseHandler)completionHandler;
- (BOOL)moveToLevelWithOnOff:(uint8_t)level
- (void)moveToLevelWithOnOff:(uint8_t)level
transitionTime:(uint16_t)transitionTime
completionHandler:(ResponseHandler)completionHandler;
- (BOOL)moveWithOnOff:(uint8_t)moveMode rate:(uint8_t)rate completionHandler:(ResponseHandler)completionHandler;
- (BOOL)step:(uint8_t)stepMode
- (void)moveWithOnOff:(uint8_t)moveMode rate:(uint8_t)rate completionHandler:(ResponseHandler)completionHandler;
- (void)step:(uint8_t)stepMode
stepSize:(uint8_t)stepSize
transitionTime:(uint16_t)transitionTime
optionMask:(uint8_t)optionMask
optionOverride:(uint8_t)optionOverride
completionHandler:(ResponseHandler)completionHandler;
- (BOOL)stepWithOnOff:(uint8_t)stepMode
- (void)stepWithOnOff:(uint8_t)stepMode
stepSize:(uint8_t)stepSize
transitionTime:(uint16_t)transitionTime
completionHandler:(ResponseHandler)completionHandler;
- (BOOL)stop:(uint8_t)optionMask optionOverride:(uint8_t)optionOverride completionHandler:(ResponseHandler)completionHandler;
- (BOOL)stopWithOnOff:(ResponseHandler)completionHandler;
- (void)stop:(uint8_t)optionMask optionOverride:(uint8_t)optionOverride completionHandler:(ResponseHandler)completionHandler;
- (void)stopWithOnOff:(ResponseHandler)completionHandler;

- (BOOL)readAttributeCurrentLevel:(ResponseHandler)completionHandler;
- (BOOL)configureAttributeCurrentLevel:(uint16_t)minInterval
- (void)readAttributeCurrentLevel:(ResponseHandler)completionHandler;
- (void)configureAttributeCurrentLevel:(uint16_t)minInterval
maxInterval:(uint16_t)maxInterval
change:(uint8_t)change
completionHandler:(ResponseHandler)completionHandler;
- (BOOL)reportAttributeCurrentLevel:(ResponseHandler)reportHandler;
- (BOOL)readAttributeRemainingTime:(ResponseHandler)completionHandler;
- (BOOL)readAttributeOptions:(ResponseHandler)completionHandler;
- (BOOL)writeAttributeOptions:(uint8_t)value completionHandler:(ResponseHandler)completionHandler;
- (BOOL)readAttributeStartUpCurrentLevel:(ResponseHandler)completionHandler;
- (BOOL)writeAttributeStartUpCurrentLevel:(uint8_t)value completionHandler:(ResponseHandler)completionHandler;
- (BOOL)readAttributeClusterRevision:(ResponseHandler)completionHandler;

- (instancetype)init NS_UNAVAILABLE;
+ (instancetype)new NS_UNAVAILABLE;
- (void)reportAttributeCurrentLevel:(ResponseHandler)reportHandler;
- (void)readAttributeRemainingTime:(ResponseHandler)completionHandler;
- (void)readAttributeOptions:(ResponseHandler)completionHandler;
- (void)writeAttributeOptions:(uint8_t)value completionHandler:(ResponseHandler)completionHandler;
- (void)readAttributeStartUpCurrentLevel:(ResponseHandler)completionHandler;
- (void)writeAttributeStartUpCurrentLevel:(uint8_t)value completionHandler:(ResponseHandler)completionHandler;
- (void)readAttributeClusterRevision:(ResponseHandler)completionHandler;

@end

NS_ASSUME_NONNULL_END

NS_ASSUME_NONNULL_BEGIN

@interface CHIPOnOff : NSObject
/**
* Cluster On/off
*
*/
@interface CHIPOnOff : CHIPCluster

- (nullable instancetype)initWithDevice:(CHIPDevice *)device endpoint:(uint8_t)endpoint queue:(dispatch_queue_t)queue;
- (BOOL)off:(ResponseHandler)completionHandler;
- (BOOL)offWithEffect:(uint8_t)effectId effectVariant:(uint8_t)effectVariant completionHandler:(ResponseHandler)completionHandler;
- (BOOL)on:(ResponseHandler)completionHandler;
- (BOOL)onWithRecallGlobalScene:(ResponseHandler)completionHandler;
- (BOOL)onWithTimedOff:(uint8_t)onOffControl
- (void)off:(ResponseHandler)completionHandler;
- (void)offWithEffect:(uint8_t)effectId effectVariant:(uint8_t)effectVariant completionHandler:(ResponseHandler)completionHandler;
- (void)on:(ResponseHandler)completionHandler;
- (void)onWithRecallGlobalScene:(ResponseHandler)completionHandler;
- (void)onWithTimedOff:(uint8_t)onOffControl
onTime:(uint16_t)onTime
offWaitTime:(uint16_t)offWaitTime
completionHandler:(ResponseHandler)completionHandler;
- (BOOL)toggle:(ResponseHandler)completionHandler;
- (void)toggle:(ResponseHandler)completionHandler;

- (BOOL)readAttributeOnOff:(ResponseHandler)completionHandler;
- (BOOL)configureAttributeOnOff:(uint16_t)minInterval
- (void)readAttributeOnOff:(ResponseHandler)completionHandler;
- (void)configureAttributeOnOff:(uint16_t)minInterval
maxInterval:(uint16_t)maxInterval
completionHandler:(ResponseHandler)completionHandler;
- (BOOL)reportAttributeOnOff:(ResponseHandler)reportHandler;
- (BOOL)readAttributeGlobalSceneControl:(ResponseHandler)completionHandler;
- (BOOL)readAttributeOnTime:(ResponseHandler)completionHandler;
- (BOOL)writeAttributeOnTime:(uint16_t)value completionHandler:(ResponseHandler)completionHandler;
- (BOOL)readAttributeOffWaitTime:(ResponseHandler)completionHandler;
- (BOOL)writeAttributeOffWaitTime:(uint16_t)value completionHandler:(ResponseHandler)completionHandler;
- (BOOL)readAttributeStartUpOnOff:(ResponseHandler)completionHandler;
- (BOOL)writeAttributeStartUpOnOff:(uint8_t)value completionHandler:(ResponseHandler)completionHandler;
- (BOOL)readAttributeClusterRevision:(ResponseHandler)completionHandler;

- (instancetype)init NS_UNAVAILABLE;
+ (instancetype)new NS_UNAVAILABLE;
- (void)reportAttributeOnOff:(ResponseHandler)reportHandler;
- (void)readAttributeGlobalSceneControl:(ResponseHandler)completionHandler;
- (void)readAttributeOnTime:(ResponseHandler)completionHandler;
- (void)writeAttributeOnTime:(uint16_t)value completionHandler:(ResponseHandler)completionHandler;
- (void)readAttributeOffWaitTime:(ResponseHandler)completionHandler;
- (void)writeAttributeOffWaitTime:(uint16_t)value completionHandler:(ResponseHandler)completionHandler;
- (void)readAttributeStartUpOnOff:(ResponseHandler)completionHandler;
- (void)writeAttributeStartUpOnOff:(uint8_t)value completionHandler:(ResponseHandler)completionHandler;
- (void)readAttributeClusterRevision:(ResponseHandler)completionHandler;

@end

Loading