Skip to content

Commit f14e43e

Browse files
restyled-commitsnivi-apple
restyled-commits
authored and
nivi-apple
committed
Restyled by clang-format
1 parent 5d2c740 commit f14e43e

9 files changed

+150
-123
lines changed

‎examples/thermostat/linux/include/thermostat-delegate-impl.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ namespace Clusters {
2626
namespace Thermostat {
2727

2828
/**
29-
* The ThermostatDelegate class serves as the instance delegate for storing Presets related information and providing it to the Thermostat server code.
30-
* It also manages the presets attribute and provides methods to write to presets, edit presets, maintain a pending presets list and either commit the
31-
* presets when requested or discard the changes. It also provide API's to get and set the attribute values.
29+
* The ThermostatDelegate class serves as the instance delegate for storing Presets related information and providing it to the
30+
* Thermostat server code. It also manages the presets attribute and provides methods to write to presets, edit presets, maintain a
31+
* pending presets list and either commit the presets when requested or discard the changes. It also provide API's to get and set
32+
* the attribute values.
3233
*
3334
*/
3435

@@ -61,7 +62,6 @@ class ThermostatDelegate : public Delegate
6162
void ClearPendingPresetList() override;
6263

6364
private:
64-
6565
static ThermostatDelegate sInstance;
6666

6767
ThermostatDelegate();

‎examples/thermostat/linux/include/thermostat-manager.h

+6-5
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ class ThermostatManager
2626
CHIP_ERROR Init();
2727

2828
/// @brief Callback called when any attribute changed on the device
29-
void AttributeChangeHandler(chip::EndpointId endpointId, chip::ClusterId clusterId, chip::AttributeId attributeId, uint8_t * value,
30-
uint16_t size);
29+
void AttributeChangeHandler(chip::EndpointId endpointId, chip::ClusterId clusterId, chip::AttributeId attributeId,
30+
uint8_t * value, uint16_t size);
3131

3232
chip::app::Clusters::Thermostat::SystemModeEnum GetSystemMode();
3333
chip::app::Clusters::Thermostat::ThermostatRunningModeEnum GetRunningMode();
@@ -54,10 +54,11 @@ class ThermostatManager
5454
static ThermostatManager sThermostatMgr;
5555

5656
/// @brief attribute handler for the thermostat endpoint
57-
void ThermostatEndpointAttributeChangeHandler(chip::ClusterId clusterId, chip::AttributeId attributeId, uint8_t * value, uint16_t size);
57+
void ThermostatEndpointAttributeChangeHandler(chip::ClusterId clusterId, chip::AttributeId attributeId, uint8_t * value,
58+
uint16_t size);
5859
void ThermostatClusterAttributeChangeHandler(chip::AttributeId attributeId, uint8_t * value, uint16_t size);
59-
void LocalTemperatureMeasurementEndpointAttributeChangeHandler(chip::ClusterId clusterId, chip::AttributeId attributeId, uint8_t * value,
60-
uint16_t size);
60+
void LocalTemperatureMeasurementEndpointAttributeChangeHandler(chip::ClusterId clusterId, chip::AttributeId attributeId,
61+
uint8_t * value, uint16_t size);
6162
void LocalTemperatureMeasurementClusterAttributeChangeHandler(chip::AttributeId attributeId, uint8_t * value, uint16_t size);
6263

6364
/// @brief Main method that evaluates the current thermostat state and updates attributes

‎examples/thermostat/linux/thermostat-delegate-impl.cpp

+23-19
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ namespace {
4141
*/
4242
bool PresetHandlesExistAndMatch(const PresetStructWithOwnedMembers & preset, const PresetStructWithOwnedMembers & presetToMatch)
4343
{
44-
return !preset.GetPresetHandle().IsNull() && !presetToMatch.GetPresetHandle().IsNull()
45-
&& preset.GetPresetHandle().Value().data_equal(presetToMatch.GetPresetHandle().Value());
44+
return !preset.GetPresetHandle().IsNull() && !presetToMatch.GetPresetHandle().IsNull() &&
45+
preset.GetPresetHandle().Value().data_equal(presetToMatch.GetPresetHandle().Value());
4646
}
4747

4848
} // anonymous namespace
4949

5050
ThermostatDelegate::ThermostatDelegate()
5151
{
52-
mNumberOfPresets = kMaxNumberOfPresetTypes * kMaxNumberOfPresetTypesOfEachType;
53-
mNextFreeIndexInPresetsList = 0;
52+
mNumberOfPresets = kMaxNumberOfPresetTypes * kMaxNumberOfPresetTypesOfEachType;
53+
mNextFreeIndexInPresetsList = 0;
5454
mNextFreeIndexInPendingPresetsList = 0;
5555

5656
InitializePresetTypes();
@@ -62,18 +62,21 @@ ThermostatDelegate::ThermostatDelegate()
6262

6363
void ThermostatDelegate::InitializePresetTypes()
6464
{
65-
PresetScenarioEnum presetScenarioEnumArray[kMaxNumberOfPresetTypes] = { PresetScenarioEnum::kOccupied, PresetScenarioEnum::kUnoccupied,
66-
PresetScenarioEnum::kSleep, PresetScenarioEnum::kWake, PresetScenarioEnum::kVacation, PresetScenarioEnum::kGoingToSleep };
65+
PresetScenarioEnum presetScenarioEnumArray[kMaxNumberOfPresetTypes] = {
66+
PresetScenarioEnum::kOccupied, PresetScenarioEnum::kUnoccupied, PresetScenarioEnum::kSleep,
67+
PresetScenarioEnum::kWake, PresetScenarioEnum::kVacation, PresetScenarioEnum::kGoingToSleep
68+
};
6769
static_assert(ArraySize(presetScenarioEnumArray) <= ArraySize(mPresetTypes));
6870

6971
uint8_t index = 0;
7072
for (PresetScenarioEnum presetScenario : presetScenarioEnumArray)
7173
{
72-
mPresetTypes[index].presetScenario = presetScenario;
74+
mPresetTypes[index].presetScenario = presetScenario;
7375
mPresetTypes[index].numberOfPresets = kMaxNumberOfPresetTypesOfEachType;
7476
mPresetTypes[index].presetTypeFeatures =
75-
(presetScenario == PresetScenarioEnum::kOccupied || presetScenario == PresetScenarioEnum::kUnoccupied) ?
76-
PresetTypeFeaturesBitmap::kAutomatic : PresetTypeFeaturesBitmap::kSupportsNames;
77+
(presetScenario == PresetScenarioEnum::kOccupied || presetScenario == PresetScenarioEnum::kUnoccupied)
78+
? PresetTypeFeaturesBitmap::kAutomatic
79+
: PresetTypeFeaturesBitmap::kSupportsNames;
7780
index++;
7881
}
7982
}
@@ -122,8 +125,7 @@ uint8_t ThermostatDelegate::GetNumberOfPresets()
122125
return mNumberOfPresets;
123126
}
124127

125-
CHIP_ERROR ThermostatDelegate::GetPresetAtIndex(size_t index,
126-
PresetStructWithOwnedMembers & preset)
128+
CHIP_ERROR ThermostatDelegate::GetPresetAtIndex(size_t index, PresetStructWithOwnedMembers & preset)
127129
{
128130
if (index < mNextFreeIndexInPresetsList)
129131
{
@@ -155,8 +157,8 @@ CHIP_ERROR ThermostatDelegate::SetActivePresetHandle(const DataModel::Nullable<B
155157
if (newActivePresetHandleSize > kPresetHandleSize)
156158
{
157159
ChipLogError(NotSpecified,
158-
"Failed to set ActivePresetHandle. newActivePresetHandle size %ld is larger than preset handle size %ld",
159-
newActivePresetHandleSize, kPresetHandleSize);
160+
"Failed to set ActivePresetHandle. newActivePresetHandle size %ld is larger than preset handle size %ld",
161+
newActivePresetHandleSize, kPresetHandleSize);
160162
return CHIP_ERROR_NO_MEMORY;
161163
}
162164
memcpy(mActivePresetHandleData, newActivePresetHandle.Value().data(), newActivePresetHandleSize);
@@ -192,7 +194,9 @@ CHIP_ERROR ThermostatDelegate::AppendToPendingPresetList(const PresetStruct::Typ
192194
}
193195
mNextFreeIndexInPendingPresetsList++;
194196
return CHIP_NO_ERROR;
195-
} else {
197+
}
198+
else
199+
{
196200
return CHIP_ERROR_WRITE_FAILED;
197201
}
198202
}
@@ -208,9 +212,9 @@ CHIP_ERROR ThermostatDelegate::GetPendingPresetAtIndex(size_t index, PresetStruc
208212
}
209213

210214
CHIP_ERROR ThermostatDelegate::ApplyPendingPresets()
211-
{
212-
for (uint8_t indexInPendingPresets = 0; indexInPendingPresets < mNextFreeIndexInPendingPresetsList; indexInPendingPresets++)
213-
{
215+
{
216+
for (uint8_t indexInPendingPresets = 0; indexInPendingPresets < mNextFreeIndexInPendingPresetsList; indexInPendingPresets++)
217+
{
214218
const PresetStructWithOwnedMembers & pendingPreset = mPendingPresets[indexInPendingPresets];
215219

216220
bool found = false;
@@ -235,8 +239,8 @@ CHIP_ERROR ThermostatDelegate::ApplyPendingPresets()
235239
mPresets[mNextFreeIndexInPresetsList].SetPresetHandle(DataModel::MakeNullable(ByteSpan(handle)));
236240
mNextFreeIndexInPresetsList++;
237241
}
238-
}
239-
return CHIP_NO_ERROR;
242+
}
243+
return CHIP_NO_ERROR;
240244
}
241245

242246
void ThermostatDelegate::ClearPendingPresetList()

‎examples/thermostat/linux/thermostat-manager.cpp

+35-26
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
* Includes
2121
*********************************************************/
2222

23-
#include "include/thermostat-delegate-impl.h"
2423
#include "include/thermostat-manager.h"
24+
#include "include/thermostat-delegate-impl.h"
2525

2626
#include <app/clusters/bindings/BindingManager.h>
2727
#include <app/clusters/thermostat-server/thermostat-server.h>
@@ -61,34 +61,39 @@ ThermostatManager ThermostatManager::sThermostatMgr;
6161
namespace {
6262

6363
template <typename DecodableAttributeType>
64-
static void OnAttributeChangeReported(const ConcreteDataAttributePath & path, const DecodableAttributeType & value);
64+
static void OnAttributeChangeReported(const ConcreteDataAttributePath & path, const DecodableAttributeType & value);
6565

66-
67-
template<>
66+
template <>
6867
void OnAttributeChangeReported<MeasuredValue::TypeInfo::DecodableType>(const ConcreteDataAttributePath & path,
69-
const MeasuredValue::TypeInfo::DecodableType & value)
68+
const MeasuredValue::TypeInfo::DecodableType & value)
7069
{
7170
ClusterId clusterId = path.mClusterId;
72-
if (clusterId != TemperatureMeasurement::Id) {
73-
ChipLogError(AppServer, "Attribute change reported for TemperatureMeasurement cluster on incorrect cluster id %u", clusterId);
71+
if (clusterId != TemperatureMeasurement::Id)
72+
{
73+
ChipLogError(AppServer, "Attribute change reported for TemperatureMeasurement cluster on incorrect cluster id %u",
74+
clusterId);
7475
return;
7576
}
7677

7778
AttributeId attributeId = path.mAttributeId;
78-
if (attributeId != MeasuredValue::Id) {
79-
ChipLogError(AppServer, "Attribute change reported for TemperatureMeasurement cluster for incorrect attribute %u", attributeId);
79+
if (attributeId != MeasuredValue::Id)
80+
{
81+
ChipLogError(AppServer, "Attribute change reported for TemperatureMeasurement cluster for incorrect attribute %u",
82+
attributeId);
8083
return;
8184
}
8285

8386
if (!value.IsNull())
8487
{
85-
ChipLogDetail(AppServer, "Attribute change reported for TemperatureMeasurement cluster - MeasuredValue is %d", static_cast<short>(value.Value()));
88+
ChipLogDetail(AppServer, "Attribute change reported for TemperatureMeasurement cluster - MeasuredValue is %d",
89+
static_cast<short>(value.Value()));
8690
}
8791
}
8892

89-
static void OnError(const ConcreteDataAttributePath * path, ChipError err) {
90-
ChipLogError(AppServer, "Subscribing to cluster Id %u and attribute Id %u failed with error %" CHIP_ERROR_FORMAT, path->mClusterId,
91-
path->mAttributeId, err.Format());
93+
static void OnError(const ConcreteDataAttributePath * path, ChipError err)
94+
{
95+
ChipLogError(AppServer, "Subscribing to cluster Id %u and attribute Id %u failed with error %" CHIP_ERROR_FORMAT,
96+
path->mClusterId, path->mAttributeId, err.Format());
9297
}
9398

9499
static void OnSubscriptionEstablished(const ReadClient & client, unsigned int value)
@@ -98,16 +103,19 @@ static void OnSubscriptionEstablished(const ReadClient & client, unsigned int va
98103

99104
template <typename DecodableAttributeType>
100105
void SubscribeToAttribute(ClusterId clusterId, AttributeId attributeId, const EmberBindingTableEntry & binding,
101-
OperationalDeviceProxy * peer_device)
106+
OperationalDeviceProxy * peer_device)
102107
{
103-
VerifyOrReturn(peer_device->GetSecureSession().HasValue(), ChipLogError(AppServer, "SubscribeToAttribute failed. Secure session is null"));
108+
VerifyOrReturn(peer_device->GetSecureSession().HasValue(),
109+
ChipLogError(AppServer, "SubscribeToAttribute failed. Secure session is null"));
104110

105-
SubscribeAttribute<DecodableAttributeType>(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote, clusterId,
106-
attributeId, &OnAttributeChangeReported<DecodableAttributeType>, &OnError, 0, kMaxIntervalCeilingSeconds, &OnSubscriptionEstablished, nullptr, true /* fabricFiltered */, true /* keepExistingSubscription */);
111+
SubscribeAttribute<DecodableAttributeType>(
112+
peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote, clusterId, attributeId,
113+
&OnAttributeChangeReported<DecodableAttributeType>, &OnError, 0, kMaxIntervalCeilingSeconds, &OnSubscriptionEstablished,
114+
nullptr, true /* fabricFiltered */, true /* keepExistingSubscription */);
107115
}
108116

109-
static void ThermostatBoundDeviceChangedHandler(const EmberBindingTableEntry & binding,
110-
OperationalDeviceProxy * peer_device, void * context)
117+
static void ThermostatBoundDeviceChangedHandler(const EmberBindingTableEntry & binding, OperationalDeviceProxy * peer_device,
118+
void * context)
111119
{
112120
VerifyOrReturn(binding.clusterId.has_value(), ChipLogError(AppServer, "Cluster Id is null"));
113121
ClusterId clusterId = binding.clusterId.value();
@@ -140,7 +148,7 @@ static void OnPlatformChipDeviceEvent(const DeviceLayer::ChipDeviceEvent * event
140148

141149
void InitBindingManager(intptr_t context)
142150
{
143-
auto & server = Server::GetInstance();
151+
auto & server = Server::GetInstance();
144152
CHIP_ERROR error = BindingManager::GetInstance().Init(
145153
{ &server.GetFabricTable(), server.GetCASESessionManager(), &server.GetPersistentStorage() });
146154

@@ -176,7 +184,8 @@ CHIP_ERROR ThermostatManager::Init()
176184
ChipLogError(AppServer,
177185
"Initialized a thermostat with \n "
178186
"mSystemMode: %hhu (%s) \n mRunningMode: %hhu (%s) \n mLocalTemperature: %d \n mOccupiedHeatingSetpoint: %d \n "
179-
"mOccupiedCoolingSetpoint: %d" "NumberOfPresets: %d",
187+
"mOccupiedCoolingSetpoint: %d"
188+
"NumberOfPresets: %d",
180189
mSystemMode, SystemModeString(mSystemMode), mRunningMode, RunningModeString(mRunningMode), mLocalTemperature,
181190
mOccupiedHeatingSetpoint, mOccupiedCoolingSetpoint, GetNumberOfPresets());
182191

@@ -201,7 +210,6 @@ void ThermostatManager::AttributeChangeHandler(EndpointId endpointId, ClusterId
201210
}
202211
}
203212

204-
205213
void ThermostatManager::ThermostatEndpointAttributeChangeHandler(ClusterId clusterId, AttributeId attributeId, uint8_t * value,
206214
uint16_t size)
207215
{
@@ -212,7 +220,8 @@ void ThermostatManager::ThermostatEndpointAttributeChangeHandler(ClusterId clust
212220
break;
213221

214222
default:
215-
ChipLogError(AppServer, "Attribute change reported for Thermostat on incorrect cluster for the thermostat endpoint. Ignoring.");
223+
ChipLogError(AppServer,
224+
"Attribute change reported for Thermostat on incorrect cluster for the thermostat endpoint. Ignoring.");
216225
break;
217226
}
218227
}
@@ -479,14 +488,14 @@ static const char * RunningModeString(ThermostatRunningModeEnum runningMode)
479488
}
480489
}
481490

482-
void MatterPostAttributeChangeCallback(const ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
483-
uint8_t * value)
491+
void MatterPostAttributeChangeCallback(const ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value)
484492
{
485493
ClusterId clusterId = attributePath.mClusterId;
486494
AttributeId attributeId = attributePath.mAttributeId;
487495
ChipLogProgress(AppServer, "Cluster callback: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
488496

489-
ChipLogProgress(AppServer, "Attribute ID changed: " ChipLogFormatMEI " Endpoint: %d ClusterId: %d Type: %u Value: %u, length %u",
497+
ChipLogProgress(AppServer,
498+
"Attribute ID changed: " ChipLogFormatMEI " Endpoint: %d ClusterId: %d Type: %u Value: %u, length %u",
490499
ChipLogValueMEI(attributeId), attributePath.mEndpointId, clusterId, type, *value, size);
491500

492501
ThermostatMgr().AttributeChangeHandler(attributePath.mEndpointId, clusterId, attributeId, value, size);

‎src/app/clusters/thermostat-server/PresetStructWithOwnedMembers.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ CHIP_ERROR PresetStructWithOwnedMembers::SetPresetHandle(const Nullable<ByteSpan
6262
size_t newPresetHandleSize = newPresetHandle.Value().size();
6363
if (newPresetHandleSize > kPresetHandleSize)
6464
{
65-
ChipLogError(Zcl, "Failed to set Preset handle. New preset handle size (%ld) > allowed preset handle size (%ld)", newPresetHandleSize, kPresetNameSize);
65+
ChipLogError(Zcl, "Failed to set Preset handle. New preset handle size (%ld) > allowed preset handle size (%ld)",
66+
newPresetHandleSize, kPresetNameSize);
6667
return CHIP_ERROR_NO_MEMORY;
6768
}
6869
MutableByteSpan targetSpan(presetHandleData);
@@ -84,7 +85,8 @@ CHIP_ERROR PresetStructWithOwnedMembers::SetName(const Optional<DataModel::Nulla
8485
size_t newNameSize = newName.Value().Value().size();
8586
if (newNameSize > kPresetNameSize)
8687
{
87-
ChipLogError(Zcl, "Failed to set Preset name. New name size (%ld) > allowed preset name size (%ld)", newNameSize, kPresetNameSize);
88+
ChipLogError(Zcl, "Failed to set Preset name. New name size (%ld) > allowed preset name size (%ld)", newNameSize,
89+
kPresetNameSize);
8890
return CHIP_ERROR_NO_MEMORY;
8991
}
9092
MutableCharSpan targetSpan(presetNameData);

‎src/app/clusters/thermostat-server/PresetStructWithOwnedMembers.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ static constexpr size_t kPresetHandleSize = 16;
3737

3838
static constexpr size_t kPresetNameSize = 64;
3939

40-
struct PresetStructWithOwnedMembers : protected Structs::PresetStruct::Type
40+
struct PresetStructWithOwnedMembers : protected Structs::PresetStruct::Type
4141
{
4242
public:
4343
PresetStructWithOwnedMembers() = default;

‎src/app/clusters/thermostat-server/thermostat-delegate.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ class Delegate
103103
virtual CHIP_ERROR GetPendingPresetAtIndex(size_t index, PresetStructWithOwnedMembers & preset) = 0;
104104

105105
/**
106-
* @brief Updates the presets attribute with the content of the pending presets list. If the preset in the pending presets list matches i.e. has the
107-
* same presetHandle as an existing entry in the Presets attribute, the thermostat will update the entry with the new preset values, otherwise
108-
* it will add a new preset to the Presets attribute. This will be called when the Thermostat receives a CommitPresetsSchedulesRequest
109-
* command to commit the pending preset changes.
106+
* @brief Updates the presets attribute with the content of the pending presets list. If the preset in the pending presets list
107+
* matches i.e. has the same presetHandle as an existing entry in the Presets attribute, the thermostat will update the entry
108+
* with the new preset values, otherwise it will add a new preset to the Presets attribute. This will be called when the
109+
* Thermostat receives a CommitPresetsSchedulesRequest command to commit the pending preset changes.
110110
*
111111
* @return CHIP_NO_ERROR if the updates to the presets attribute has been committed successfully.
112112
* @return CHIP_ERROR if the updates to the presets attribute failed to commit for some reason.

0 commit comments

Comments
 (0)