Skip to content

Commit 8b0f0cf

Browse files
hastyhasty
committed
Fix capitalization of structs, methods, fields, etc.
1 parent 9f30f30 commit 8b0f0cf

File tree

1 file changed

+83
-83
lines changed

1 file changed

+83
-83
lines changed

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

+83-83
Original file line numberDiff line numberDiff line change
@@ -222,25 +222,25 @@ int16_t EnforceCoolingSetpointLimits(int16_t CoolingSetpoint, EndpointId endpoin
222222

223223
struct SetpointLimits
224224
{
225-
bool AutoSupported = false;
226-
bool HeatSupported = false;
227-
bool CoolSupported = false;
228-
bool OccupancySupported = false;
229-
230-
int16_t AbsMinHeatSetpointLimit;
231-
int16_t AbsMaxHeatSetpointLimit;
232-
int16_t MinHeatSetpointLimit;
233-
int16_t MaxHeatSetpointLimit;
234-
int16_t AbsMinCoolSetpointLimit;
235-
int16_t AbsMaxCoolSetpointLimit;
236-
int16_t MinCoolSetpointLimit;
237-
int16_t MaxCoolSetpointLimit;
238-
int8_t DeadBand = 0;
239-
int16_t DeadBandTemp = 0;
240-
int16_t OccupiedCoolingSetpoint;
241-
int16_t OccupiedHeatingSetpoint;
242-
int16_t UnoccupiedCoolingSetpoint;
243-
int16_t UnoccupiedHeatingSetpoint;
225+
bool autoSupported = false;
226+
bool heatSupported = false;
227+
bool coolSupported = false;
228+
bool occupancySupported = false;
229+
230+
int16_t absMinHeatSetpointLimit;
231+
int16_t absMaxHeatSetpointLimit;
232+
int16_t minHeatSetpointLimit;
233+
int16_t maxHeatSetpointLimit;
234+
int16_t absMinCoolSetpointLimit;
235+
int16_t absMaxCoolSetpointLimit;
236+
int16_t minCoolSetpointLimit;
237+
int16_t maxCoolSetpointLimit;
238+
int8_t deadBand = 0;
239+
int16_t deadBandTemp = 0;
240+
int16_t occupiedCoolingSetpoint;
241+
int16_t occupiedHeatingSetpoint;
242+
int16_t unoccupiedCoolingSetpoint;
243+
int16_t unoccupiedHeatingSetpoint;
244244
};
245245

246246
/**
@@ -250,85 +250,85 @@ struct SetpointLimits
250250
* @param setpointLimits The SetpointLimits to populate
251251
* @return Success if the limits were read completely, otherwise an error code
252252
*/
253-
Status getSetpointLimits(EndpointId endpoint, SetpointLimits & setpointLimits)
253+
Status GetSetpointLimits(EndpointId endpoint, SetpointLimits & setpointLimits)
254254
{
255255
uint32_t flags;
256256
if (FeatureMap::Get(endpoint, &flags) != Status::Success)
257257
{
258-
ChipLogError(Zcl, "getSetpointLimits: could not get feature flags");
258+
ChipLogError(Zcl, "GetSetpointLimits: could not get feature flags");
259259
flags = FEATURE_MAP_DEFAULT;
260260
}
261261

262262
auto featureMap = BitMask<Feature, uint32_t>(flags);
263-
setpointLimits.AutoSupported = featureMap.Has(Feature::kAutoMode);
264-
setpointLimits.HeatSupported = featureMap.Has(Feature::kHeating);
265-
setpointLimits.CoolSupported = featureMap.Has(Feature::kCooling);
266-
setpointLimits.OccupancySupported = featureMap.Has(Feature::kOccupancy);
263+
setpointLimits.autoSupported = featureMap.Has(Feature::kAutoMode);
264+
setpointLimits.heatSupported = featureMap.Has(Feature::kHeating);
265+
setpointLimits.coolSupported = featureMap.Has(Feature::kCooling);
266+
setpointLimits.occupancySupported = featureMap.Has(Feature::kOccupancy);
267267

268-
if (setpointLimits.AutoSupported)
268+
if (setpointLimits.autoSupported)
269269
{
270-
int8_t deadband = 0;
271-
if (MinSetpointDeadBand::Get(endpoint, &deadband) != Status::Success)
270+
setpointLimits.deadBand = 0;
271+
if (MinSetpointDeadBand::Get(endpoint, &setpointLimits.deadBand) != Status::Success)
272272
{
273-
deadband = kDefaultDeadBand;
273+
setpointLimits.deadBand = kDefaultDeadBand;
274274
}
275-
setpointLimits.DeadBandTemp = static_cast<int16_t>(deadband * 10);
275+
setpointLimits.deadBandTemp = static_cast<int16_t>(setpointLimits.deadBand * 10);
276276
}
277277

278-
if (AbsMinCoolSetpointLimit::Get(endpoint, &setpointLimits.AbsMinCoolSetpointLimit) != Status::Success)
279-
setpointLimits.AbsMinCoolSetpointLimit = kDefaultAbsMinCoolSetpointLimit;
278+
if (AbsMinCoolSetpointLimit::Get(endpoint, &setpointLimits.absMinCoolSetpointLimit) != Status::Success)
279+
setpointLimits.absMinCoolSetpointLimit = kDefaultAbsMinCoolSetpointLimit;
280280

281-
if (AbsMaxCoolSetpointLimit::Get(endpoint, &setpointLimits.AbsMaxCoolSetpointLimit) != Status::Success)
282-
setpointLimits.AbsMaxCoolSetpointLimit = kDefaultAbsMaxCoolSetpointLimit;
281+
if (AbsMaxCoolSetpointLimit::Get(endpoint, &setpointLimits.absMaxCoolSetpointLimit) != Status::Success)
282+
setpointLimits.absMaxCoolSetpointLimit = kDefaultAbsMaxCoolSetpointLimit;
283283

284-
if (MinCoolSetpointLimit::Get(endpoint, &setpointLimits.MinCoolSetpointLimit) != Status::Success)
285-
setpointLimits.MinCoolSetpointLimit = setpointLimits.AbsMinCoolSetpointLimit;
284+
if (MinCoolSetpointLimit::Get(endpoint, &setpointLimits.minCoolSetpointLimit) != Status::Success)
285+
setpointLimits.minCoolSetpointLimit = setpointLimits.absMinCoolSetpointLimit;
286286

287-
if (MaxCoolSetpointLimit::Get(endpoint, &setpointLimits.MaxCoolSetpointLimit) != Status::Success)
288-
setpointLimits.MaxCoolSetpointLimit = setpointLimits.AbsMaxCoolSetpointLimit;
287+
if (MaxCoolSetpointLimit::Get(endpoint, &setpointLimits.maxCoolSetpointLimit) != Status::Success)
288+
setpointLimits.maxCoolSetpointLimit = setpointLimits.absMaxCoolSetpointLimit;
289289

290-
if (AbsMinHeatSetpointLimit::Get(endpoint, &setpointLimits.AbsMinHeatSetpointLimit) != Status::Success)
291-
setpointLimits.AbsMinHeatSetpointLimit = kDefaultAbsMinHeatSetpointLimit;
290+
if (AbsMinHeatSetpointLimit::Get(endpoint, &setpointLimits.absMinHeatSetpointLimit) != Status::Success)
291+
setpointLimits.absMinHeatSetpointLimit = kDefaultAbsMinHeatSetpointLimit;
292292

293-
if (AbsMaxHeatSetpointLimit::Get(endpoint, &setpointLimits.AbsMaxHeatSetpointLimit) != Status::Success)
294-
setpointLimits.AbsMaxHeatSetpointLimit = kDefaultAbsMaxHeatSetpointLimit;
293+
if (AbsMaxHeatSetpointLimit::Get(endpoint, &setpointLimits.absMaxHeatSetpointLimit) != Status::Success)
294+
setpointLimits.absMaxHeatSetpointLimit = kDefaultAbsMaxHeatSetpointLimit;
295295

296-
if (MinHeatSetpointLimit::Get(endpoint, &setpointLimits.MinHeatSetpointLimit) != Status::Success)
297-
setpointLimits.MinHeatSetpointLimit = setpointLimits.AbsMinHeatSetpointLimit;
296+
if (MinHeatSetpointLimit::Get(endpoint, &setpointLimits.minHeatSetpointLimit) != Status::Success)
297+
setpointLimits.minHeatSetpointLimit = setpointLimits.absMinHeatSetpointLimit;
298298

299-
if (MaxHeatSetpointLimit::Get(endpoint, &setpointLimits.MaxHeatSetpointLimit) != Status::Success)
300-
setpointLimits.MaxHeatSetpointLimit = setpointLimits.AbsMaxHeatSetpointLimit;
299+
if (MaxHeatSetpointLimit::Get(endpoint, &setpointLimits.maxHeatSetpointLimit) != Status::Success)
300+
setpointLimits.maxHeatSetpointLimit = setpointLimits.absMaxHeatSetpointLimit;
301301

302-
if (setpointLimits.CoolSupported)
302+
if (setpointLimits.coolSupported)
303303
{
304-
if (OccupiedCoolingSetpoint::Get(endpoint, &setpointLimits.OccupiedCoolingSetpoint) != Status::Success)
304+
if (OccupiedCoolingSetpoint::Get(endpoint, &setpointLimits.occupiedCoolingSetpoint) != Status::Success)
305305
{
306306
ChipLogError(Zcl, "Error: Can not read Occupied Cooling Setpoint");
307307
return Status::Failure;
308308
}
309309
}
310310

311-
if (setpointLimits.HeatSupported)
311+
if (setpointLimits.heatSupported)
312312
{
313-
if (OccupiedHeatingSetpoint::Get(endpoint, &setpointLimits.OccupiedHeatingSetpoint) != Status::Success)
313+
if (OccupiedHeatingSetpoint::Get(endpoint, &setpointLimits.occupiedHeatingSetpoint) != Status::Success)
314314
{
315315
ChipLogError(Zcl, "Error: Can not read Occupied Heating Setpoint");
316316
return Status::Failure;
317317
}
318318
}
319319

320-
if (setpointLimits.CoolSupported && setpointLimits.OccupancySupported)
320+
if (setpointLimits.coolSupported && setpointLimits.occupancySupported)
321321
{
322-
if (UnoccupiedCoolingSetpoint::Get(endpoint, &setpointLimits.UnoccupiedCoolingSetpoint) != Status::Success)
322+
if (UnoccupiedCoolingSetpoint::Get(endpoint, &setpointLimits.unoccupiedCoolingSetpoint) != Status::Success)
323323
{
324324
ChipLogError(Zcl, "Error: Can not read Unoccupied Cooling Setpoint");
325325
return Status::Failure;
326326
}
327327
}
328328

329-
if (setpointLimits.HeatSupported && setpointLimits.OccupancySupported)
329+
if (setpointLimits.heatSupported && setpointLimits.occupancySupported)
330330
{
331-
if (UnoccupiedHeatingSetpoint::Get(endpoint, &setpointLimits.UnoccupiedHeatingSetpoint) != Status::Success)
331+
if (UnoccupiedHeatingSetpoint::Get(endpoint, &setpointLimits.unoccupiedHeatingSetpoint) != Status::Success)
332332
{
333333
ChipLogError(Zcl, "Error: Can not read Unoccupied Heating Setpoint");
334334
return Status::Failure;
@@ -347,7 +347,7 @@ Status getSetpointLimits(EndpointId endpoint, SetpointLimits & setpointLimits)
347347
* @param deadband The deadband to preserve
348348
* @return Success if the deadband can be preserved, InvalidValue if it cannot
349349
*/
350-
Status checkHeatingSetpointDeadband(bool autoSupported, int16_t newCoolingSetpoint, int16_t minHeatingSetpoint, int16_t deadband)
350+
Status CheckHeatingSetpointDeadband(bool autoSupported, int16_t newCoolingSetpoint, int16_t minHeatingSetpoint, int16_t deadband)
351351
{
352352
if (!autoSupported)
353353
{
@@ -374,7 +374,7 @@ Status checkHeatingSetpointDeadband(bool autoSupported, int16_t newCoolingSetpoi
374374
* @param deadband The deadband to preserve
375375
* @return Success if the deadband can be preserved, InvalidValue if it cannot
376376
*/
377-
Status checkCoolingSetpointDeadband(bool autoSupported, int16_t newHeatingSetpoint, int16_t maxCoolingSetpoint, int16_t deadband)
377+
Status CheckCoolingSetpointDeadband(bool autoSupported, int16_t newHeatingSetpoint, int16_t maxCoolingSetpoint, int16_t deadband)
378378
{
379379
if (!autoSupported)
380380
{
@@ -391,7 +391,7 @@ Status checkCoolingSetpointDeadband(bool autoSupported, int16_t newHeatingSetpoi
391391
return Status::Success;
392392
}
393393

394-
typedef Status (*setpointSetter)(EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
394+
typedef Status (*SetpointSetter)(EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty);
395395

396396
/**
397397
* @brief Attempts to ensure that a change to the heating setpoint maintains the deadband with the cooling setpoint
@@ -404,8 +404,8 @@ typedef Status (*setpointSetter)(EndpointId endpoint, int16_t value, MarkAttribu
404404
* @param deadband The deadband to preserve
405405
* @param setter A function for setting the cooling setpoint
406406
*/
407-
void ensureCoolingSetpointDeadband(EndpointId endpoint, int16_t currentCoolingSetpoint, int16_t newHeatingSetpoint,
408-
int16_t maxCoolingSetpoint, int16_t deadband, setpointSetter setter)
407+
void EnsureCoolingSetpointDeadband(EndpointId endpoint, int16_t currentCoolingSetpoint, int16_t newHeatingSetpoint,
408+
int16_t maxCoolingSetpoint, int16_t deadband, SetpointSetter setter)
409409
{
410410
int16_t minValidCoolingSetpoint = newHeatingSetpoint;
411411
minValidCoolingSetpoint += deadband;
@@ -417,15 +417,15 @@ void ensureCoolingSetpointDeadband(EndpointId endpoint, int16_t currentCoolingSe
417417
if (minValidCoolingSetpoint > maxCoolingSetpoint)
418418
{
419419
// Adjusting the cool setpoint to preserve the deadband would violate the max cool setpoint
420-
// This should have been caught in checkCoolingSetpointDeadband, so log and exit
420+
// This should have been caught in CheckCoolingSetpointDeadband, so log and exit
421421
ChipLogError(Zcl, "Failed ensuring cooling setpoint deadband");
422422
return;
423423
}
424424
// Adjust the cool setpoint to preserve deadband
425425
auto status = setter(endpoint, minValidCoolingSetpoint, MarkAttributeDirty::kYes);
426426
if (status != Status::Success)
427427
{
428-
ChipLogError(Zcl, "Error: ensureCoolingSetpointDeadband failed!");
428+
ChipLogError(Zcl, "Error: EnsureCoolingSetpointDeadband failed!");
429429
}
430430
}
431431

@@ -440,8 +440,8 @@ void ensureCoolingSetpointDeadband(EndpointId endpoint, int16_t currentCoolingSe
440440
* @param deadband The deadband to preserve
441441
* @param setter A function for setting the heating setpoint
442442
*/
443-
void ensureHeatingSetpointDeadband(EndpointId endpoint, int16_t currentHeatingSetpoint, int16_t newCoolingSetpoint,
444-
int16_t minHeatingSetpoint, int16_t deadband, setpointSetter setter)
443+
void EnsureHeatingSetpointDeadband(EndpointId endpoint, int16_t currentHeatingSetpoint, int16_t newCoolingSetpoint,
444+
int16_t minHeatingSetpoint, int16_t deadband, SetpointSetter setter)
445445
{
446446
int16_t maxValidHeatingSetpoint = newCoolingSetpoint;
447447
maxValidHeatingSetpoint -= deadband;
@@ -453,15 +453,15 @@ void ensureHeatingSetpointDeadband(EndpointId endpoint, int16_t currentHeatingSe
453453
if (maxValidHeatingSetpoint < minHeatingSetpoint)
454454
{
455455
// Adjusting the heating setpoint to preserve the deadband would violate the max cooling setpoint
456-
// This should have been caught in checkHeatingSetpointDeadband, so log and exit
456+
// This should have been caught in CheckHeatingSetpointDeadband, so log and exit
457457
ChipLogError(Zcl, "Failed ensuring heating setpoint deadband");
458458
return;
459459
}
460460
// Adjust the heating setpoint to preserve deadband
461461
auto status = setter(endpoint, maxValidHeatingSetpoint, MarkAttributeDirty::kYes);
462462
if (status != Status::Success)
463463
{
464-
ChipLogError(Zcl, "Error: ensureHeatingSetpointDeadband failed!");
464+
ChipLogError(Zcl, "Error: EnsureHeatingSetpointDeadband failed!");
465465
}
466466
}
467467

@@ -473,39 +473,39 @@ void ensureHeatingSetpointDeadband(EndpointId endpoint, int16_t currentHeatingSe
473473
*
474474
* @param attributePath
475475
*/
476-
void ensureDeadband(const ConcreteAttributePath & attributePath)
476+
void EnsureDeadband(const ConcreteAttributePath & attributePath)
477477
{
478478
auto endpoint = attributePath.mEndpointId;
479479
SetpointLimits setpointLimits;
480-
auto status = getSetpointLimits(endpoint, setpointLimits);
480+
auto status = GetSetpointLimits(endpoint, setpointLimits);
481481
if (status != Status::Success)
482482
{
483483
return;
484484
}
485-
if (!setpointLimits.AutoSupported)
485+
if (!setpointLimits.autoSupported)
486486
{
487487
return;
488488
}
489489
switch (attributePath.mAttributeId)
490490
{
491491
case OccupiedHeatingSetpoint::Id:
492-
ensureCoolingSetpointDeadband(endpoint, setpointLimits.OccupiedCoolingSetpoint, setpointLimits.OccupiedHeatingSetpoint,
493-
setpointLimits.MaxCoolSetpointLimit, setpointLimits.DeadBandTemp,
492+
EnsureCoolingSetpointDeadband(endpoint, setpointLimits.occupiedCoolingSetpoint, setpointLimits.occupiedHeatingSetpoint,
493+
setpointLimits.maxCoolSetpointLimit, setpointLimits.deadBandTemp,
494494
OccupiedCoolingSetpoint::Set);
495495
break;
496496
case OccupiedCoolingSetpoint::Id:
497-
ensureHeatingSetpointDeadband(endpoint, setpointLimits.OccupiedHeatingSetpoint, setpointLimits.OccupiedCoolingSetpoint,
498-
setpointLimits.MinHeatSetpointLimit, setpointLimits.DeadBandTemp,
497+
EnsureHeatingSetpointDeadband(endpoint, setpointLimits.occupiedHeatingSetpoint, setpointLimits.occupiedCoolingSetpoint,
498+
setpointLimits.minHeatSetpointLimit, setpointLimits.deadBandTemp,
499499
OccupiedHeatingSetpoint::Set);
500500
break;
501501
case UnoccupiedHeatingSetpoint::Id:
502-
ensureCoolingSetpointDeadband(endpoint, setpointLimits.UnoccupiedCoolingSetpoint, setpointLimits.UnoccupiedHeatingSetpoint,
503-
setpointLimits.MaxCoolSetpointLimit, setpointLimits.DeadBandTemp,
502+
EnsureCoolingSetpointDeadband(endpoint, setpointLimits.unoccupiedCoolingSetpoint, setpointLimits.unoccupiedHeatingSetpoint,
503+
setpointLimits.maxCoolSetpointLimit, setpointLimits.deadBandTemp,
504504
UnoccupiedCoolingSetpoint::Set);
505505
break;
506506
case UnoccupiedCoolingSetpoint::Id:
507-
ensureHeatingSetpointDeadband(endpoint, setpointLimits.UnoccupiedHeatingSetpoint, setpointLimits.UnoccupiedCoolingSetpoint,
508-
setpointLimits.MinHeatSetpointLimit, setpointLimits.DeadBandTemp,
507+
EnsureHeatingSetpointDeadband(endpoint, setpointLimits.unoccupiedHeatingSetpoint, setpointLimits.unoccupiedCoolingSetpoint,
508+
setpointLimits.minHeatSetpointLimit, setpointLimits.deadBandTemp,
509509
UnoccupiedHeatingSetpoint::Set);
510510
break;
511511
}
@@ -786,12 +786,12 @@ void MatterThermostatClusterServerAttributeChangedCallback(const ConcreteAttribu
786786
case OccupiedHeatingSetpoint::Id:
787787
case OccupiedCoolingSetpoint::Id:
788788
clearActivePreset = supportsPresets && occupied;
789-
ensureDeadband(attributePath);
789+
EnsureDeadband(attributePath);
790790
break;
791791
case UnoccupiedHeatingSetpoint::Id:
792792
case UnoccupiedCoolingSetpoint::Id:
793793
clearActivePreset = supportsPresets && !occupied;
794-
ensureDeadband(attributePath);
794+
EnsureDeadband(attributePath);
795795
break;
796796
}
797797
if (clearActivePreset)
@@ -830,7 +830,7 @@ Status MatterThermostatClusterServerPreAttributeChangedCallback(const app::Concr
830830

831831
// Limits will be needed for all checks
832832
// so we just get them all now
833-
// TODO: use getSetpointLimits to fetch this information
833+
// TODO: use GetSetpointLimits to fetch this information
834834
int16_t AbsMinHeatSetpointLimit;
835835
int16_t AbsMaxHeatSetpointLimit;
836836
int16_t MinHeatSetpointLimit;
@@ -936,7 +936,7 @@ Status MatterThermostatClusterServerPreAttributeChangedCallback(const app::Concr
936936
if (requested < AbsMinHeatSetpointLimit || requested < MinHeatSetpointLimit || requested > AbsMaxHeatSetpointLimit ||
937937
requested > MaxHeatSetpointLimit)
938938
return Status::InvalidValue;
939-
return checkCoolingSetpointDeadband(AutoSupported, requested, std::min(MaxCoolSetpointLimit, AbsMaxCoolSetpointLimit),
939+
return CheckCoolingSetpointDeadband(AutoSupported, requested, std::min(MaxCoolSetpointLimit, AbsMaxCoolSetpointLimit),
940940
DeadBandTemp);
941941
}
942942

@@ -947,7 +947,7 @@ Status MatterThermostatClusterServerPreAttributeChangedCallback(const app::Concr
947947
if (requested < AbsMinCoolSetpointLimit || requested < MinCoolSetpointLimit || requested > AbsMaxCoolSetpointLimit ||
948948
requested > MaxCoolSetpointLimit)
949949
return Status::InvalidValue;
950-
return checkHeatingSetpointDeadband(AutoSupported, requested, std::max(MinHeatSetpointLimit, AbsMinHeatSetpointLimit),
950+
return CheckHeatingSetpointDeadband(AutoSupported, requested, std::max(MinHeatSetpointLimit, AbsMinHeatSetpointLimit),
951951
DeadBandTemp);
952952
}
953953

@@ -958,7 +958,7 @@ Status MatterThermostatClusterServerPreAttributeChangedCallback(const app::Concr
958958
if (requested < AbsMinHeatSetpointLimit || requested < MinHeatSetpointLimit || requested > AbsMaxHeatSetpointLimit ||
959959
requested > MaxHeatSetpointLimit)
960960
return Status::InvalidValue;
961-
return checkCoolingSetpointDeadband(AutoSupported, requested, std::min(MaxCoolSetpointLimit, AbsMaxCoolSetpointLimit),
961+
return CheckCoolingSetpointDeadband(AutoSupported, requested, std::min(MaxCoolSetpointLimit, AbsMaxCoolSetpointLimit),
962962
DeadBandTemp);
963963
}
964964
case UnoccupiedCoolingSetpoint::Id: {
@@ -968,7 +968,7 @@ Status MatterThermostatClusterServerPreAttributeChangedCallback(const app::Concr
968968
if (requested < AbsMinCoolSetpointLimit || requested < MinCoolSetpointLimit || requested > AbsMaxCoolSetpointLimit ||
969969
requested > MaxCoolSetpointLimit)
970970
return Status::InvalidValue;
971-
return checkHeatingSetpointDeadband(AutoSupported, requested, std::max(MinHeatSetpointLimit, AbsMinHeatSetpointLimit),
971+
return CheckHeatingSetpointDeadband(AutoSupported, requested, std::max(MinHeatSetpointLimit, AbsMinHeatSetpointLimit),
972972
DeadBandTemp);
973973
}
974974

0 commit comments

Comments
 (0)