Skip to content

Commit 88785ee

Browse files
restyled-commitssatyanaag-silabs
authored andcommitted
Restyled by whitespace
1 parent 83d5671 commit 88785ee

File tree

2 files changed

+66
-66
lines changed

2 files changed

+66
-66
lines changed

src/app/clusters/closure-control-server/closure-control-server.cpp

+36-36
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <app/ConcreteAttributePath.h>
2323
#include <app/InteractionModelEngine.h>
2424
#include <app/util/attribute-storage.h>
25-
25+
2626
using namespace chip;
2727
using namespace chip::app;
2828
using namespace chip::app::DataModel;
@@ -31,47 +31,47 @@
3131
using namespace chip::app::Clusters::ClosureControl::Attributes;
3232
using namespace chip::app::Clusters::ClosureControl::Commands;
3333
using chip::Protocols::InteractionModel::Status;
34-
34+
3535
namespace chip {
3636
namespace app {
3737
namespace Clusters {
3838
namespace ClosureControl {
39-
39+
4040
CHIP_ERROR Instance::Init()
4141
{
4242
ReturnErrorOnFailure(CommandHandlerInterfaceRegistry::Instance().RegisterCommandHandler(this));
4343
VerifyOrReturnError(AttributeAccessInterfaceRegistry::Instance().Register(this), CHIP_ERROR_INCORRECT_STATE);
44-
44+
4545
return CHIP_NO_ERROR;
4646
}
47-
47+
4848
void Instance::Shutdown()
4949
{
5050
CommandHandlerInterfaceRegistry::Instance().UnregisterCommandHandler(this);
5151
AttributeAccessInterfaceRegistry::Instance().Unregister(this);
5252
}
53-
53+
5454
bool Instance::HasFeature(Feature aFeature) const
5555
{
5656
return mFeature.Has(aFeature);
5757
}
58-
58+
5959
bool Instance::SupportsOptAttr(OptionalAttributes aOptionalAttrs) const
6060
{
6161
return mOptionalAttrs.Has(aOptionalAttrs);
6262
}
63-
63+
6464
// AttributeAccessInterface
6565
CHIP_ERROR Instance::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
6666
{
6767
VerifyOrDie(aPath.mClusterId == ClosureControl::Id);
68-
68+
6969
switch (aPath.mAttributeId)
7070
{
7171
case CountdownTime::Id:
7272
if (SupportsOptAttr(OptionalAttributes::kCountdownTime))
7373
{
74-
return aEncoder.Encode(mDelegate.GetCountdownTime());
74+
return aEncoder.Encode(mDelegate.GetCountdownTime());
7575
}
7676
return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
7777
case MainState::Id:
@@ -120,37 +120,37 @@
120120
/* Allow all other unhandled attributes to fall through to Ember */
121121
return CHIP_NO_ERROR;
122122
}
123-
123+
124124
CHIP_ERROR Instance::EncodeCurrentErrorList(const AttributeValueEncoder::ListEncodeHelper & encoder)
125125
{
126126
CHIP_ERROR err = CHIP_NO_ERROR;
127-
127+
128128
ReturnErrorOnFailure(mDelegate.StartCurrentErrorListRead());
129129
for (size_t i = 0; true; i++)
130130
{
131131
ClosureErrorEnum error;
132-
132+
133133
err = mDelegate.GetCurrentErrorListAtIndex(i, error);
134134
if (err == CHIP_ERROR_PROVIDER_LIST_EXHAUSTED)
135135
{
136136
// Convert end of list to CHIP_NO_ERROR
137137
err = CHIP_NO_ERROR;
138138
goto exit;
139139
}
140-
140+
141141
// Check if another error occurred before trying to encode
142142
SuccessOrExit(err);
143-
143+
144144
err = encoder.Encode(error);
145145
SuccessOrExit(err);
146146
}
147-
147+
148148
exit:
149149
// Tell the delegate the read is complete
150150
err = mDelegate.EndCurrentErrorListRead();
151151
return err;
152152
}
153-
153+
154154
CHIP_ERROR Instance::Write(const ConcreteDataAttributePath & aPath, AttributeValueDecoder & aDecoder)
155155
{
156156
switch (aPath.mAttributeId)
@@ -162,19 +162,19 @@
162162
return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
163163
}
164164
}
165-
165+
166166
// CommandHandlerInterface
167167
void Instance::InvokeCommand(HandlerContext & handlerContext)
168168
{
169169
using namespace Commands;
170-
170+
171171
switch (handlerContext.mRequestPath.mCommandId)
172172
{
173173
case Stop::Id:
174174
if (!HasFeature(Feature::kInstantaneous))
175175
{
176176
HandleCommand<Stop::DecodableType>(
177-
handlerContext, [this](HandlerContext & ctx, const auto & commandData) { HandleStop(ctx, commandData); });
177+
handlerContext, [this](HandlerContext & ctx, const auto & commandData) { HandleStop(ctx, commandData); });
178178
}
179179
else
180180
{
@@ -220,65 +220,65 @@
220220
return;
221221
}
222222
}
223-
223+
224224
void Instance::HandleStop(HandlerContext & ctx, const Commands::Stop::DecodableType & commandData)
225225
{
226226
// No parameters for this command
227227
// Call the delegate
228228
Status status = mDelegate.Stop();
229-
229+
230230
ctx.mCommandHandler.AddStatus(ctx.mRequestPath, status);
231231
}
232-
232+
233233
void Instance::HandleMoveTo(HandlerContext & ctx, const Commands::MoveTo::DecodableType & commandData)
234234
{
235235
const Optional<TagPositionEnum> tag = commandData.tag;
236236
const Optional<TagLatchEnum> latch = commandData.latch;
237237
const Optional<Globals::ThreeLevelAutoEnum> speed = commandData.speed;
238-
238+
239239
// Call the delegate
240240
Status status = mDelegate.MoveTo(tag, latch, speed);
241-
241+
242242
ctx.mCommandHandler.AddStatus(ctx.mRequestPath, status);
243243
}
244-
244+
245245
void Instance::HandleCalibrate(HandlerContext & ctx, const Commands::Calibrate::DecodableType & commandData)
246246
{
247247
// No parameters for this command
248248
// Call the delegate
249249
Status status = mDelegate.Calibrate();
250-
250+
251251
ctx.mCommandHandler.AddStatus(ctx.mRequestPath, status);
252252
}
253-
253+
254254
void Instance::HandleConfigureFallback(HandlerContext & ctx, const Commands::ConfigureFallback::DecodableType & commandData)
255255
{
256256
const Optional<RestingProcedureEnum> restingProcedure = commandData.restingProcedure;
257257
const Optional<TriggerConditionEnum> triggerCondition = commandData.triggerCondition;
258258
const Optional<TriggerPositionEnum> triggerPosition = commandData.triggerPosition;
259259
const Optional<uint32_t> waitingDelay = commandData.waitingDelay;
260-
260+
261261
// Call the delegate
262262
Status status = mDelegate.ConfigureFallback(restingProcedure, triggerCondition, triggerPosition, waitingDelay);
263-
263+
264264
ctx.mCommandHandler.AddStatus(ctx.mRequestPath, status);
265265
}
266-
266+
267267
void Instance::HandleCancelFallback(HandlerContext & ctx, const Commands::CancelFallback::DecodableType & commandData)
268268
{
269269
// No parameters for this command
270270
// Call the delegate
271271
Status status = mDelegate.CancelFallback();
272-
272+
273273
ctx.mCommandHandler.AddStatus(ctx.mRequestPath, status);
274274
}
275-
275+
276276
} // namespace ClosureControl
277277
} // namespace Clusters
278278
} // namespace app
279279
} // namespace chip
280-
280+
281281
// -----------------------------------------------------------------------------
282282
// Plugin initialization
283-
284-
void MatterClosureControlPluginServerInitCallback() {}
283+
284+
void MatterClosureControlPluginServerInitCallback() {}

src/app/clusters/closure-control-server/closure-control-server.h

+30-30
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <app/util/attribute-storage.h>
2929
#include <lib/core/CHIPError.h>
3030
#include <protocols/interaction_model/StatusCode.h>
31-
31+
3232
namespace chip {
3333
namespace app {
3434
namespace Clusters {
@@ -41,35 +41,35 @@
4141
{
4242
public:
4343
virtual ~Delegate() = default;
44-
44+
4545
void SetEndpointId(EndpointId aEndpoint) { mEndpointId = aEndpoint; }
4646
EndpointId GetEndpointId() { return mEndpointId; }
47-
47+
4848
// ------------------------------------------------------------------
4949
// Commands
50-
virtual Protocols::InteractionModel::Status Stop() = 0;
50+
virtual Protocols::InteractionModel::Status Stop() = 0;
5151
virtual Protocols::InteractionModel::Status MoveTo(const Optional<TagPositionEnum> tag,
5252
const Optional<TagLatchEnum> latch,
53-
const Optional<Globals::ThreeLevelAutoEnum> speed) = 0;
54-
virtual Protocols::InteractionModel::Status Calibrate() = 0;
53+
const Optional<Globals::ThreeLevelAutoEnum> speed) = 0;
54+
virtual Protocols::InteractionModel::Status Calibrate() = 0;
5555
virtual Protocols::InteractionModel::Status ConfigureFallback(const Optional<RestingProcedureEnum> restingProcedure,
5656
const Optional<TriggerConditionEnum> triggerCondition,
5757
const Optional<TriggerPositionEnum> triggerPosition,
58-
const Optional<uint32_t> waitingDelay) = 0;
59-
virtual Protocols::InteractionModel::Status CancelFallback() = 0;
60-
58+
const Optional<uint32_t> waitingDelay) = 0;
59+
virtual Protocols::InteractionModel::Status CancelFallback() = 0;
60+
6161
// ------------------------------------------------------------------
6262
// Get attribute methods
6363
virtual DataModel::Nullable<uint32_t> GetCountdownTime() = 0;
64-
virtual MainStateEnum GetMainState() = 0;
65-
virtual DataModel::Nullable<Structs::OverallStateStruct::Type> GetOverallState() = 0;
66-
virtual DataModel::Nullable<Structs::OverallTargetStruct::Type> GetOverallTarget() = 0;
67-
virtual RestingProcedureEnum GetRestingProcedure() = 0;
68-
virtual TriggerConditionEnum GetTriggerCondition() = 0;
69-
virtual TriggerPositionEnum GetTriggerPosition() = 0;
70-
virtual uint32_t GetWaitingDelay() = 0;
64+
virtual MainStateEnum GetMainState() = 0;
65+
virtual DataModel::Nullable<Structs::OverallStateStruct::Type> GetOverallState() = 0;
66+
virtual DataModel::Nullable<Structs::OverallTargetStruct::Type> GetOverallTarget() = 0;
67+
virtual RestingProcedureEnum GetRestingProcedure() = 0;
68+
virtual TriggerConditionEnum GetTriggerCondition() = 0;
69+
virtual TriggerPositionEnum GetTriggerPosition() = 0;
70+
virtual uint32_t GetWaitingDelay() = 0;
7171
virtual uint32_t GetKickoffTimer() = 0;
72-
72+
7373
/* These functions are called by the ReadAttribute handler to iterate through lists
7474
* The cluster server will call Start<Type>Read to allow the delegate to create a temporary
7575
* lock on the data.
@@ -79,58 +79,58 @@
7979
virtual CHIP_ERROR StartCurrentErrorListRead() = 0;
8080
virtual CHIP_ERROR GetCurrentErrorListAtIndex(size_t,ClosureErrorEnum &) = 0;
8181
virtual CHIP_ERROR EndCurrentErrorListRead() = 0;
82-
82+
8383
protected:
8484
EndpointId mEndpointId = 0;
8585
};
86-
86+
8787
enum class OptionalAttributes : uint32_t
8888
{
8989
kCountdownTime = 0x1
9090
};
91-
91+
9292
class Instance : public AttributeAccessInterface, public CommandHandlerInterface
9393
{
9494
public:
9595
Instance(EndpointId aEndpointId, Delegate & aDelegate, Feature aFeature,
9696
OptionalAttributes aOptionalAttrs) :
9797
AttributeAccessInterface(MakeOptional(aEndpointId), Id),
98-
CommandHandlerInterface(MakeOptional(aEndpointId), Id), mDelegate(aDelegate),
98+
CommandHandlerInterface(MakeOptional(aEndpointId), Id), mDelegate(aDelegate),
9999
mFeature(aFeature), mOptionalAttrs(aOptionalAttrs)
100100
{
101101
/* set the base class delegates endpointId */
102102
mDelegate.SetEndpointId(aEndpointId);
103103
}
104104
~Instance() { Shutdown(); }
105-
105+
106106
CHIP_ERROR Init();
107107
void Shutdown();
108-
108+
109109
bool HasFeature(Feature aFeature) const;
110110
bool SupportsOptAttr(OptionalAttributes aOptionalAttrs) const;
111-
111+
112112
private:
113113
Delegate & mDelegate;
114114
BitMask<Feature> mFeature;
115115
BitMask<OptionalAttributes> mOptionalAttrs;
116-
116+
117117
// AttributeAccessInterface
118118
CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
119119
CHIP_ERROR Write(const ConcreteDataAttributePath & aPath, AttributeValueDecoder & aDecoder) override;
120-
120+
121121
CHIP_ERROR EncodeCurrentErrorList(const AttributeValueEncoder::ListEncodeHelper & aEncoder);
122-
122+
123123
// CommandHandlerInterface
124124
void InvokeCommand(HandlerContext & handlerContext) override;
125-
125+
126126
void HandleStop(HandlerContext & ctx, const Commands::Stop::DecodableType & commandData);
127127
void HandleMoveTo(HandlerContext & ctx, const Commands::MoveTo::DecodableType & commandData);
128128
void HandleCalibrate(HandlerContext & ctx, const Commands::Calibrate::DecodableType & commandData);
129129
void HandleConfigureFallback(HandlerContext & ctx, const Commands::ConfigureFallback::DecodableType & commandData);
130130
void HandleCancelFallback(HandlerContext & ctx, const Commands::CancelFallback::DecodableType & commandData);
131131
};
132-
132+
133133
} // namespace ClosureControl
134134
} // namespace Clusters
135135
} // namespace app
136-
} // namespace chip
136+
} // namespace chip

0 commit comments

Comments
 (0)