Skip to content

Commit 86c38ed

Browse files
restyled-commitshicklin
authored andcommitted
Restyled by clang-format
1 parent 75a3369 commit 86c38ed

File tree

5 files changed

+21
-24
lines changed

5 files changed

+21
-24
lines changed

examples/rvc-app/rvc-common/include/rvc-service-area-delegate.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class RvcServiceAreaDelegate : public Delegate
4747
bool IsSetSelectedAreasAllowed(MutableCharSpan statusText) override;
4848

4949
bool IsValidSelectAreasSet(const ServiceArea::Commands::SelectAreas::DecodableType & req,
50-
ServiceArea::SelectAreasStatus & locationStatus, MutableCharSpan statusText) override;
50+
ServiceArea::SelectAreasStatus & locationStatus, MutableCharSpan statusText) override;
5151

5252
bool HandleSkipCurrentArea(MutableCharSpan skipStatusText) override;
5353

examples/rvc-app/rvc-common/src/rvc-service-area-delegate.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ bool RvcServiceAreaDelegate::IsSetSelectedAreasAllowed(MutableCharSpan statusTex
8080
};
8181

8282
bool RvcServiceAreaDelegate::IsValidSelectAreasSet(const Commands::SelectAreas::DecodableType & req,
83-
SelectAreasStatus & locationStatus, MutableCharSpan statusText)
83+
SelectAreasStatus & locationStatus, MutableCharSpan statusText)
8484
{
8585
// TODO IMPLEMENT
8686
return true;

src/app/clusters/service-area-server/service-area-cluster-objects.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ struct AreaStructureWrapper : public chip::app::Clusters::ServiceArea::Structs::
6161
* @note If aLocationName is an empty string and aFloorNumber and aAreaTypeTag are null, locationInfo will be set to null.
6262
*/
6363
AreaStructureWrapper(uint32_t aAreaID, const DataModel::Nullable<uint8_t> & aMapId, const CharSpan & aLocationName,
64-
const DataModel::Nullable<int16_t> & aFloorNumber,
65-
const DataModel::Nullable<Globals::AreaTypeTag> & aAreaTypeTag,
66-
const DataModel::Nullable<Globals::LandmarkTag> & aLandmarkTag,
67-
const DataModel::Nullable<Globals::PositionTag> & aPositionTag,
68-
const DataModel::Nullable<Globals::FloorSurfaceTag> & aSurfaceTag)
64+
const DataModel::Nullable<int16_t> & aFloorNumber,
65+
const DataModel::Nullable<Globals::AreaTypeTag> & aAreaTypeTag,
66+
const DataModel::Nullable<Globals::LandmarkTag> & aLandmarkTag,
67+
const DataModel::Nullable<Globals::PositionTag> & aPositionTag,
68+
const DataModel::Nullable<Globals::FloorSurfaceTag> & aSurfaceTag)
6969
{
7070
Set(aAreaID, aMapId, aLocationName, aFloorNumber, aAreaTypeTag, aLandmarkTag, aPositionTag, aSurfaceTag);
7171
}
@@ -193,7 +193,7 @@ struct AreaStructureWrapper : public chip::app::Clusters::ServiceArea::Structs::
193193
enum class IsEqualConfig : uint8_t
194194
{
195195
kIgnoreAreaID = 0x1,
196-
kIgnoreMapId = 0x2,
196+
kIgnoreMapId = 0x2,
197197
};
198198

199199
/**

src/app/clusters/service-area-server/service-area-delegate.h

+8-10
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ class Instance;
3131
// *****************************************************************************
3232
// cluster constraints
3333

34-
constexpr size_t kMaxNumSupportedAreas = 255;
35-
constexpr size_t kMaxNumSupportedMaps = 255;
36-
constexpr size_t kMaxNumSelectedAreas = 255;
37-
constexpr size_t kMaxNumProgressElements = 255;
34+
constexpr size_t kMaxNumSupportedAreas = 255;
35+
constexpr size_t kMaxNumSupportedMaps = 255;
36+
constexpr size_t kMaxNumSelectedAreas = 255;
37+
constexpr size_t kMaxNumProgressElements = 255;
3838

3939
constexpr size_t kMaxSizeStatusText = 256;
4040

@@ -90,8 +90,8 @@ class Delegate
9090
* @note If the SelectAreas command is allowed when the device is operating and the selected locations change to none, the
9191
* device must stop.
9292
*/
93-
virtual bool IsValidSelectAreasSet(const Commands::SelectAreas::DecodableType & req,
94-
SelectAreasStatus & locationStatus, MutableCharSpan statusText) = 0;
93+
virtual bool IsValidSelectAreasSet(const Commands::SelectAreas::DecodableType & req, SelectAreasStatus & locationStatus,
94+
MutableCharSpan statusText) = 0;
9595

9696
/**
9797
* @brief The server instance ensures that the SelectedAreas and CurrentArea attributes are not null before
@@ -162,8 +162,7 @@ class Delegate
162162
*
163163
* @note may be overloaded in device implementation for optimization, if desired.
164164
*/
165-
virtual bool GetSupportedLocationById(uint32_t aAreaId, uint32_t & listIndex,
166-
AreaStructureWrapper & aSupportedLocation);
165+
virtual bool GetSupportedLocationById(uint32_t aAreaId, uint32_t & listIndex, AreaStructureWrapper & aSupportedLocation);
167166

168167
/**
169168
* This method is called by the server instance to add a new location to the list.
@@ -333,8 +332,7 @@ class Delegate
333332
*
334333
* @note may be overloaded in device implementation for optimization, if desired.
335334
*/
336-
virtual bool GetProgressElementById(uint32_t aAreaId, uint32_t & listIndex,
337-
Structs::ProgressStruct::Type & aProgressElement);
335+
virtual bool GetProgressElementById(uint32_t aAreaId, uint32_t & listIndex, Structs::ProgressStruct::Type & aProgressElement);
338336

339337
/**
340338
* @brief Is the progress element in the progress list?

src/app/clusters/service-area-server/service-area-server.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -571,16 +571,15 @@ bool Instance::ReportEstimatedEndTimeChange(const DataModel::Nullable<uint32_t>
571571
return (aEstimatedEndTime.Value() < mEstimatedEndTime.Value());
572572
}
573573

574-
bool Instance::AddSupportedLocation(uint32_t aAreaId, const DataModel::Nullable<uint8_t> & aMapId,
575-
const CharSpan & aLocationName, const DataModel::Nullable<int16_t> & aFloorNumber,
574+
bool Instance::AddSupportedLocation(uint32_t aAreaId, const DataModel::Nullable<uint8_t> & aMapId, const CharSpan & aLocationName,
575+
const DataModel::Nullable<int16_t> & aFloorNumber,
576576
const DataModel::Nullable<Globals::AreaTypeTag> & aAreaType,
577577
const DataModel::Nullable<Globals::LandmarkTag> & aLandmarkTag,
578578
const DataModel::Nullable<Globals::PositionTag> & aPositionTag,
579579
const DataModel::Nullable<Globals::FloorSurfaceTag> & aSurfaceTag)
580580
{
581581
// Create location object for validation.
582-
AreaStructureWrapper aNewArea(aAreaId, aMapId, aLocationName, aFloorNumber, aAreaType, aLandmarkTag, aPositionTag,
583-
aSurfaceTag);
582+
AreaStructureWrapper aNewArea(aAreaId, aMapId, aLocationName, aFloorNumber, aAreaType, aLandmarkTag, aPositionTag, aSurfaceTag);
584583

585584
// Does device mode allow this attribute to be updated?
586585
if (!mDelegate->IsSupportedAreasChangeAllowed())
@@ -655,8 +654,8 @@ bool Instance::ModifySupportedLocation(uint32_t aAreaId, const DataModel::Nullab
655654
}
656655

657656
// create new location object for validation
658-
AreaStructureWrapper aNewArea(aAreaId, aMapId, aLocationName, aFloorNumber, aAreaType, aLandmarkTag,
659-
aPositionTag, aSurfaceTag);
657+
AreaStructureWrapper aNewArea(aAreaId, aMapId, aLocationName, aFloorNumber, aAreaType, aLandmarkTag, aPositionTag,
658+
aSurfaceTag);
660659

661660
// verify cluster requirements concerning valid fields and field relationships
662661
if (!IsValidSupportedLocation(aNewArea))

0 commit comments

Comments
 (0)