Skip to content

Commit 1070656

Browse files
restyled-commitsOliverFan1
authored andcommitted
Restyled by clang-format
1 parent 67722ba commit 1070656

File tree

2 files changed

+43
-47
lines changed

2 files changed

+43
-47
lines changed

src/app/clusters/occupancy-sensor-server/occupancy-sensor-server.cpp

+32-35
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,15 @@
1515
* limitations under the License.
1616
*/
1717

18-
#include "occupancy-hal.h"
1918
#include "occupancy-sensor-server.h"
19+
#include "occupancy-hal.h"
2020

2121
#include <app/AttributeAccessInterfaceRegistry.h>
22-
#include <app/data-model/Encode.h>
2322
#include <app/EventLogging.h>
23+
#include <app/data-model/Encode.h>
2424
#include <app/util/attribute-storage.h>
2525
#include <lib/core/CHIPError.h>
2626

27-
28-
2927
using chip::Protocols::InteractionModel::Status;
3028

3129
namespace chip {
@@ -35,19 +33,19 @@ namespace OccupancySensing {
3533

3634
Structs::HoldTimeLimitsStruct::Type * HoldTimeLimitsManager::HoldTimeLimits::GetHoldTimeLimitsStruct(EndpointId endpoint)
3735
{
38-
size_t endpointIndex = 0;
39-
Structs::HoldTimeLimitsStruct::Type * holdTimeLimitsStruct = nullptr;
40-
CHIP_ERROR status = FindHoldTimeLimitsIndex(endpoint, endpointIndex);
41-
if (CHIP_NO_ERROR == status)
36+
size_t endpointIndex = 0;
37+
Structs::HoldTimeLimitsStruct::Type * holdTimeLimitsStruct = nullptr;
38+
CHIP_ERROR status = FindHoldTimeLimitsIndex(endpoint, endpointIndex);
39+
if (CHIP_NO_ERROR == status)
4240
{
4341
holdTimeLimitsStruct = &mHoldTimeLimitsStructs[endpointIndex];
4442
}
4543
return holdTimeLimitsStruct;
4644
}
4745

48-
49-
CHIP_ERROR HoldTimeLimitsManager::HoldTimeLimits::SetHoldTimeLimitsStruct(EndpointId endpoint,
50-
Structs::HoldTimeLimitsStruct::Type & holdTimeLimitsStruct)
46+
CHIP_ERROR
47+
HoldTimeLimitsManager::HoldTimeLimits::SetHoldTimeLimitsStruct(EndpointId endpoint,
48+
Structs::HoldTimeLimitsStruct::Type & holdTimeLimitsStruct)
5149
{
5250
VerifyOrReturnError(kInvalidEndpointId != endpoint, CHIP_ERROR_INVALID_ARGUMENT);
5351

@@ -67,8 +65,8 @@ CHIP_ERROR HoldTimeLimitsManager::HoldTimeLimits::FindHoldTimeLimitsIndex(Endpoi
6765
{
6866
VerifyOrReturnError(kInvalidEndpointId != endpoint, CHIP_ERROR_INVALID_ARGUMENT);
6967

70-
uint16_t index =
71-
emberAfGetClusterServerEndpointIndex(endpoint, OccupancySensing::Id, MATTER_DM_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT);
68+
uint16_t index = emberAfGetClusterServerEndpointIndex(endpoint, OccupancySensing::Id,
69+
MATTER_DM_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT);
7270

7371
if (index < ArraySize(mHoldTimeLimitsStructs))
7472
{
@@ -90,41 +88,41 @@ CHIP_ERROR HoldTimeLimitsManager::Init()
9088
// Prevents re-initializing
9189
VerifyOrReturnError(!mIsInitialized, CHIP_ERROR_INCORRECT_STATE);
9290

93-
for(size_t i = 0; i <= kOccupancySensingServerMaxEndpointCount; i++)
91+
for (size_t i = 0; i <= kOccupancySensingServerMaxEndpointCount; i++)
9492
{
95-
if(emberAfContainsServer(EndpointId(i), OccupancySensing::Id))
96-
{
97-
Structs::HoldTimeLimitsStruct::Type holdTimeLimitsInit;
93+
if (emberAfContainsServer(EndpointId(i), OccupancySensing::Id))
94+
{
95+
Structs::HoldTimeLimitsStruct::Type holdTimeLimitsInit;
9896

99-
// Set up some sane initial values for hold time limits structures
100-
holdTimeLimitsInit.holdTimeMin = 1;
101-
holdTimeLimitsInit.holdTimeMax = 300;
102-
holdTimeLimitsInit.holdTimeDefault = 10;
97+
// Set up some sane initial values for hold time limits structures
98+
holdTimeLimitsInit.holdTimeMin = 1;
99+
holdTimeLimitsInit.holdTimeMax = 300;
100+
holdTimeLimitsInit.holdTimeDefault = 10;
103101

104-
HoldTimeLimitsManager::Instance().SetHoldTimeLimitsStruct(EndpointId(i),holdTimeLimitsInit);
105-
}
106-
}
102+
HoldTimeLimitsManager::Instance().SetHoldTimeLimitsStruct(EndpointId(i), holdTimeLimitsInit);
103+
}
104+
}
107105

108106
VerifyOrReturnError(registerAttributeAccessOverride(this), CHIP_ERROR_INCORRECT_STATE);
109107

110-
111108
mIsInitialized = true;
112109
return CHIP_NO_ERROR;
113110
}
114111

115-
//AttributeAccessInterface
112+
// AttributeAccessInterface
116113
CHIP_ERROR HoldTimeLimitsManager::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
117114
{
118115
switch (aPath.mAttributeId)
119116
{
120117
case Attributes::HoldTimeLimits::Id: {
121118

122-
Structs::HoldTimeLimitsStruct::Type * holdTimeLimitsStruct = HoldTimeLimitsManager::Instance().mHoldTimeLimits.GetHoldTimeLimitsStruct(aPath.mEndpointId);
123-
Structs::HoldTimeLimitsStruct::Type res;
124-
res.holdTimeMin = holdTimeLimitsStruct->holdTimeMin;
125-
res.holdTimeMax = holdTimeLimitsStruct->holdTimeMax;
126-
res.holdTimeDefault = holdTimeLimitsStruct->holdTimeDefault;
127-
return aEncoder.Encode(res);
119+
Structs::HoldTimeLimitsStruct::Type * holdTimeLimitsStruct =
120+
HoldTimeLimitsManager::Instance().mHoldTimeLimits.GetHoldTimeLimitsStruct(aPath.mEndpointId);
121+
Structs::HoldTimeLimitsStruct::Type res;
122+
res.holdTimeMin = holdTimeLimitsStruct->holdTimeMin;
123+
res.holdTimeMax = holdTimeLimitsStruct->holdTimeMax;
124+
res.holdTimeDefault = holdTimeLimitsStruct->holdTimeDefault;
125+
return aEncoder.Encode(res);
128126
}
129127
default:
130128
return CHIP_NO_ERROR;
@@ -138,7 +136,7 @@ Structs::HoldTimeLimitsStruct::Type * HoldTimeLimitsManager::GetHoldTimeLimitsSt
138136
}
139137

140138
CHIP_ERROR HoldTimeLimitsManager::SetHoldTimeLimitsStruct(EndpointId endpoint,
141-
Structs::HoldTimeLimitsStruct::Type & holdTimeLimitsStruct)
139+
Structs::HoldTimeLimitsStruct::Type & holdTimeLimitsStruct)
142140
{
143141
ReturnErrorOnFailure(mHoldTimeLimits.SetHoldTimeLimitsStruct(endpoint, holdTimeLimitsStruct));
144142
return CHIP_NO_ERROR;
@@ -214,15 +212,14 @@ void halOccupancyStateChangedCallback(EndpointId endpoint, HalOccupancyState occ
214212
Attributes::Occupancy::Set(endpoint, occupancyState);
215213
}
216214

217-
218215
HalOccupancySensorType __attribute__((weak)) halOccupancyGetSensorType(EndpointId endpoint)
219216
{
220217
return HAL_OCCUPANCY_SENSOR_TYPE_PIR;
221218
}
222219

223220
void MatterOccupancySensingPluginServerInitCallback()
224221
{
225-
CHIP_ERROR err = HoldTimeLimitsManager::Instance().Init();
222+
CHIP_ERROR err = HoldTimeLimitsManager::Instance().Init();
226223
if (err != CHIP_NO_ERROR)
227224
{
228225
ChipLogError(Zcl, "HoldTimeLimitsManager::Instance().Init() error: %" CHIP_ERROR_FORMAT, err.Format());

src/app/clusters/occupancy-sensor-server/occupancy-sensor-server.h

+11-12
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include <app/util/config.h>
2626
#include <lib/core/DataModelTypes.h>
2727

28-
2928
namespace chip {
3029
namespace app {
3130
namespace Clusters {
@@ -37,19 +36,19 @@ namespace OccupancySensing {
3736
class HoldTimeLimitsManager : public AttributeAccessInterface
3837
{
3938
public:
40-
static constexpr size_t kOccupancySensingServerMaxEndpointCount =
39+
static constexpr size_t kOccupancySensingServerMaxEndpointCount =
4140
MATTER_DM_OCCUPANCY_SENSING_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT;
4241
static_assert(kOccupancySensingServerMaxEndpointCount <= kInvalidEndpointId, "Occupancy Sensing endpoint count error");
4342

44-
//HoldTimeLimits
43+
// HoldTimeLimits
4544
class HoldTimeLimits
4645
{
4746
public:
48-
Structs::HoldTimeLimitsStruct::Type * GetHoldTimeLimitsStruct(EndpointId endpoint);
47+
Structs::HoldTimeLimitsStruct::Type * GetHoldTimeLimitsStruct(EndpointId endpoint);
4948
CHIP_ERROR SetHoldTimeLimitsStruct(EndpointId endpoint, Structs::HoldTimeLimitsStruct::Type & holdTimeLimitsStruct);
5049

5150
private:
52-
/// @brief Returns the index of the HoldTimeLimits associated to an endpoint
51+
/// @brief Returns the index of the HoldTimeLimits associated to an endpoint
5352
/// @param[in] endpoint target endpoint
5453
/// @param[out] endpointIndex index of the corresponding HoldTimeLimits for an endpoint
5554
/// @return CHIP_NO_ERROR or CHIP_ERROR_NOT_FOUND, CHIP_ERROR_INVALID_ARGUMENT if invalid endpoint
@@ -58,27 +57,27 @@ class HoldTimeLimitsManager : public AttributeAccessInterface
5857
Structs::HoldTimeLimitsStruct::Type mHoldTimeLimitsStructs[kOccupancySensingServerMaxEndpointCount];
5958
};
6059

61-
static HoldTimeLimitsManager & Instance();
60+
static HoldTimeLimitsManager & Instance();
6261

63-
CHIP_ERROR Init();
62+
CHIP_ERROR Init();
6463

65-
// AttributeAccessInterface
64+
// AttributeAccessInterface
6665
CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
6766

68-
// HoldTimeLimitsStruct Accessors
67+
// HoldTimeLimitsStruct Accessors
6968
Structs::HoldTimeLimitsStruct::Type * GetHoldTimeLimitsStruct(EndpointId endpoint);
7069
CHIP_ERROR SetHoldTimeLimitsStruct(EndpointId endpoint, Structs::HoldTimeLimitsStruct::Type & holdTimeLimitsStruct);
7170

7271
private:
7372
HoldTimeLimitsManager() : AttributeAccessInterface(Optional<EndpointId>(), Id) {}
74-
~HoldTimeLimitsManager() { }
73+
~HoldTimeLimitsManager() {}
7574

7675
bool mIsInitialized = false;
7776

78-
// HoldTimeLimits
77+
// HoldTimeLimits
7978
HoldTimeLimits mHoldTimeLimits;
8079

81-
// Instance
80+
// Instance
8281
static HoldTimeLimitsManager mInstance;
8382
};
8483

0 commit comments

Comments
 (0)