Skip to content

Commit 1cab752

Browse files
restyled-commitshicklin
authored andcommitted
Restyled by clang-format
1 parent 63edf2e commit 1cab752

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,14 @@ CHIP_ERROR RvcServiceAreaDelegate::Init()
4040
// Location A has name, floor number, uses map XX
4141
GetInstance()->AddSupportedLocation(
4242
supportedLocationId_A, DataModel::Nullable<uint_fast8_t>(supportedMapId_XX), "My Location A"_span,
43-
DataModel::Nullable<int16_t>(4), DataModel::Nullable<Globals::AreaTypeTag>(),
44-
DataModel::Nullable<Globals::LandmarkTag>(), DataModel::Nullable<Globals::PositionTag>(),
45-
DataModel::Nullable<Globals::FloorSurfaceTag>());
43+
DataModel::Nullable<int16_t>(4), DataModel::Nullable<Globals::AreaTypeTag>(), DataModel::Nullable<Globals::LandmarkTag>(),
44+
DataModel::Nullable<Globals::PositionTag>(), DataModel::Nullable<Globals::FloorSurfaceTag>());
4645

4746
// Location B has name, uses map XX
4847
GetInstance()->AddSupportedLocation(
4948
supportedLocationId_B, DataModel::Nullable<uint_fast8_t>(supportedMapId_XX), "My Location B"_span,
50-
DataModel::Nullable<int16_t>(), DataModel::Nullable<Globals::AreaTypeTag>(),
51-
DataModel::Nullable<Globals::LandmarkTag>(), DataModel::Nullable<Globals::PositionTag>(),
52-
DataModel::Nullable<Globals::FloorSurfaceTag>());
49+
DataModel::Nullable<int16_t>(), DataModel::Nullable<Globals::AreaTypeTag>(), DataModel::Nullable<Globals::LandmarkTag>(),
50+
DataModel::Nullable<Globals::PositionTag>(), DataModel::Nullable<Globals::FloorSurfaceTag>());
5351

5452
// Location C has full SemData, no name, Map YY
5553
GetInstance()->AddSupportedLocation(supportedLocationId_C, DataModel::Nullable<uint_fast8_t>(supportedMapId_YY), CharSpan(),

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ struct LocationStructureWrapper : public chip::app::Clusters::ServiceArea::Struc
3939
LocationStructureWrapper()
4040
{
4141
Set(0, 0, CharSpan(), DataModel::Nullable<int16_t>(), DataModel::Nullable<Globals::AreaTypeTag>(),
42-
DataModel::Nullable<Globals::LandmarkTag>(), DataModel::Nullable<Globals::PositionTag>(), DataModel::Nullable<Globals::FloorSurfaceTag>());
42+
DataModel::Nullable<Globals::LandmarkTag>(), DataModel::Nullable<Globals::PositionTag>(),
43+
DataModel::Nullable<Globals::FloorSurfaceTag>());
4344
}
4445

4546
/**
@@ -121,7 +122,8 @@ struct LocationStructureWrapper : public chip::app::Clusters::ServiceArea::Struc
121122
*/
122123
void Set(uint32_t aLocationId, const DataModel::Nullable<uint8_t> & aMapId, const CharSpan & aLocationName,
123124
const DataModel::Nullable<int16_t> & aFloorNumber, const DataModel::Nullable<Globals::AreaTypeTag> & aAreaType,
124-
const DataModel::Nullable<Globals::LandmarkTag> & aLandmarkTag, const DataModel::Nullable<Globals::PositionTag> & aPositionTag,
125+
const DataModel::Nullable<Globals::LandmarkTag> & aLandmarkTag,
126+
const DataModel::Nullable<Globals::PositionTag> & aPositionTag,
125127
const DataModel::Nullable<Globals::FloorSurfaceTag> & aSurfaceTag)
126128
{
127129
locationID = aLocationId;

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ class Instance : public AttributeAccessInterface, public CommandHandlerInterface
183183
* @note if aLocationName is larger than kLocationNameMaxSize, it will be truncated.
184184
*/
185185
bool AddSupportedLocation(uint32_t aLocationId, const DataModel::Nullable<uint8_t> & aMapId, const CharSpan & aLocationName,
186-
const DataModel::Nullable<int16_t> & aFloorNumber, const DataModel::Nullable<Globals::AreaTypeTag> & aAreaType,
186+
const DataModel::Nullable<int16_t> & aFloorNumber,
187+
const DataModel::Nullable<Globals::AreaTypeTag> & aAreaType,
187188
const DataModel::Nullable<Globals::LandmarkTag> & aLandmarkTag,
188189
const DataModel::Nullable<Globals::PositionTag> & aPositionTag,
189190
const DataModel::Nullable<Globals::FloorSurfaceTag> & aSurfaceTag);

0 commit comments

Comments
 (0)