Skip to content

Commit 7b90986

Browse files
hastyhasty
committed
Formatting electrical-power-measurement-server
1 parent 060823b commit 7b90986

File tree

2 files changed

+114
-103
lines changed

2 files changed

+114
-103
lines changed

‎src/app/clusters/electrical-power-measurement-server/electrical-power-measurement-server.cpp

+90-79
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <app/reporting/reporting.h>
2525
#include <app/util/attribute-storage.h>
2626

27-
2827
using namespace chip;
2928
using namespace chip::app;
3029
using namespace chip::app::DataModel;
@@ -66,143 +65,155 @@ CHIP_ERROR Instance::Read(const ConcreteReadAttributePath & aPath, AttributeValu
6665
{
6766
switch (aPath.mAttributeId)
6867
{
69-
case FeatureMap::Id:
68+
case FeatureMap::Id:
7069
ReturnErrorOnFailure(aEncoder.Encode(mFeature.Raw()));
7170
break;
72-
case PowerMode::Id:
73-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetPowerMode()));
74-
break;
71+
case PowerMode::Id:
72+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetPowerMode()));
73+
break;
7574
case NumberOfMeasurementTypes::Id:
76-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetNumberOfMeasurementTypes()));
77-
break;
75+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetNumberOfMeasurementTypes()));
76+
break;
7877
case Accuracy::Id:
79-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetAccuracy()));
80-
break;
78+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetAccuracy()));
79+
break;
8180
case Ranges::Id:
82-
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeRanges))
81+
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeRanges))
8382
{
8483
return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
8584
}
86-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetRanges()));
87-
break;
85+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetRanges()));
86+
break;
8887
case Voltage::Id:
89-
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeVoltage))
88+
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeVoltage))
9089
{
9190
return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
9291
}
93-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetVoltage()));
94-
break;
92+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetVoltage()));
93+
break;
9594
case ActiveCurrent::Id:
96-
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeActiveCurrent))
95+
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeActiveCurrent))
9796
{
9897
return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
9998
}
100-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetActiveCurrent()));
101-
break;
99+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetActiveCurrent()));
100+
break;
102101
case ReactiveCurrent::Id:
103-
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeReactiveCurrent))
102+
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeReactiveCurrent))
104103
{
105104
return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
106105
}
107-
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kAlternatingCurrent), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
108-
ChipLogError(Zcl, "Electrical Power Measurement: can not get ReactiveCurrent, feature is not supported"));
109-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetReactiveCurrent()));
110-
break;
106+
VerifyOrReturnError(
107+
HasFeature(ElectricalPowerMeasurement::Feature::kAlternatingCurrent), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
108+
ChipLogError(Zcl, "Electrical Power Measurement: can not get ReactiveCurrent, feature is not supported"));
109+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetReactiveCurrent()));
110+
break;
111111
case ApparentCurrent::Id:
112-
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeApparentCurrent))
112+
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeApparentCurrent))
113113
{
114114
return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
115115
}
116-
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kAlternatingCurrent), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
117-
ChipLogError(Zcl, "Electrical Power Measurement: can not get ApparentCurrent, feature is not supported"));
118-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetApparentCurrent()));
119-
break;
116+
VerifyOrReturnError(
117+
HasFeature(ElectricalPowerMeasurement::Feature::kAlternatingCurrent), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
118+
ChipLogError(Zcl, "Electrical Power Measurement: can not get ApparentCurrent, feature is not supported"));
119+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetApparentCurrent()));
120+
break;
120121
case ActivePower::Id:
121-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetActivePower()));
122-
break;
122+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetActivePower()));
123+
break;
123124
case ReactivePower::Id:
124-
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeReactivePower))
125+
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeReactivePower))
125126
{
126127
return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
127128
}
128-
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kAlternatingCurrent), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
129-
ChipLogError(Zcl, "Electrical Power Measurement: can not get ReactivePower, feature is not supported"));
130-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetReactivePower()));
131-
break;
129+
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kAlternatingCurrent),
130+
CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
131+
ChipLogError(Zcl, "Electrical Power Measurement: can not get ReactivePower, feature is not supported"));
132+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetReactivePower()));
133+
break;
132134
case ApparentPower::Id:
133-
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeApparentPower))
135+
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeApparentPower))
134136
{
135137
return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
136138
}
137-
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kAlternatingCurrent), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
138-
ChipLogError(Zcl, "Electrical Power Measurement: can not get ApparentPower, feature is not supported"));
139-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetApparentPower()));
140-
break;
139+
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kAlternatingCurrent),
140+
CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
141+
ChipLogError(Zcl, "Electrical Power Measurement: can not get ApparentPower, feature is not supported"));
142+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetApparentPower()));
143+
break;
141144
case RMSVoltage::Id:
142-
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeRMSVoltage))
145+
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeRMSVoltage))
143146
{
144147
return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
145148
}
146-
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kAlternatingCurrent), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
147-
ChipLogError(Zcl, "Electrical Power Measurement: can not get RMSVoltage, feature is not supported"));
148-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetRMSVoltage()));
149-
break;
149+
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kAlternatingCurrent),
150+
CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
151+
ChipLogError(Zcl, "Electrical Power Measurement: can not get RMSVoltage, feature is not supported"));
152+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetRMSVoltage()));
153+
break;
150154
case RMSCurrent::Id:
151-
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeRMSCurrent))
155+
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeRMSCurrent))
152156
{
153157
return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
154158
}
155-
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kAlternatingCurrent), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
156-
ChipLogError(Zcl, "Electrical Power Measurement: can not get RMSCurrent, feature is not supported"));
157-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetRMSCurrent()));
158-
break;
159+
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kAlternatingCurrent),
160+
CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
161+
ChipLogError(Zcl, "Electrical Power Measurement: can not get RMSCurrent, feature is not supported"));
162+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetRMSCurrent()));
163+
break;
159164
case RMSPower::Id:
160-
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeRMSPower))
165+
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeRMSPower))
161166
{
162167
return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
163168
}
164-
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kAlternatingCurrent), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
165-
ChipLogError(Zcl, "Electrical Power Measurement: can not get RMSPower, feature is not supported"));
166-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetRMSPower()));
167-
break;
169+
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kAlternatingCurrent),
170+
CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
171+
ChipLogError(Zcl, "Electrical Power Measurement: can not get RMSPower, feature is not supported"));
172+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetRMSPower()));
173+
break;
168174
case Frequency::Id:
169-
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeFrequency))
175+
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeFrequency))
170176
{
171177
return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
172178
}
173-
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kAlternatingCurrent), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
174-
ChipLogError(Zcl, "Electrical Power Measurement: can not get Frequency, feature is not supported"));
175-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetFrequency()));
176-
break;
179+
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kAlternatingCurrent),
180+
CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
181+
ChipLogError(Zcl, "Electrical Power Measurement: can not get Frequency, feature is not supported"));
182+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetFrequency()));
183+
break;
177184
case HarmonicCurrents::Id:
178-
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kHarmonics), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
179-
ChipLogError(Zcl, "Electrical Power Measurement: can not get HarmonicCurrents, feature is not supported"));
180-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetHarmonicCurrents()));
181-
break;
185+
VerifyOrReturnError(
186+
HasFeature(ElectricalPowerMeasurement::Feature::kHarmonics), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
187+
ChipLogError(Zcl, "Electrical Power Measurement: can not get HarmonicCurrents, feature is not supported"));
188+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetHarmonicCurrents()));
189+
break;
182190
case HarmonicPhases::Id:
183-
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kPowerQuality), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
184-
ChipLogError(Zcl, "Electrical Power Measurement: can not get HarmonicPhases, feature is not supported"));
185-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetHarmonicPhases()));
186-
break;
191+
VerifyOrReturnError(
192+
HasFeature(ElectricalPowerMeasurement::Feature::kPowerQuality), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
193+
ChipLogError(Zcl, "Electrical Power Measurement: can not get HarmonicPhases, feature is not supported"));
194+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetHarmonicPhases()));
195+
break;
187196
case PowerFactor::Id:
188-
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributePowerFactor))
197+
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributePowerFactor))
189198
{
190199
return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
191200
}
192-
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kAlternatingCurrent), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
193-
ChipLogError(Zcl, "Electrical Power Measurement: can not get PowerFactor, feature is not supported"));
194-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetPowerFactor()));
195-
break;
201+
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kAlternatingCurrent),
202+
CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
203+
ChipLogError(Zcl, "Electrical Power Measurement: can not get PowerFactor, feature is not supported"));
204+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetPowerFactor()));
205+
break;
196206
case NeutralCurrent::Id:
197-
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeNeutralCurrent))
207+
if (!SupportsOptAttr(OptionalAttributes::kOptionalAttributeNeutralCurrent))
198208
{
199209
return CHIP_IM_GLOBAL_STATUS(UnsupportedAttribute);
200210
}
201-
VerifyOrReturnError(HasFeature(ElectricalPowerMeasurement::Feature::kPolyphasePower), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
202-
ChipLogError(Zcl, "Electrical Power Measurement: can not get NeutralCurrent, feature is not supported"));
203-
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetNeutralCurrent()));
204-
break;
205-
}
211+
VerifyOrReturnError(
212+
HasFeature(ElectricalPowerMeasurement::Feature::kPolyphasePower), CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE,
213+
ChipLogError(Zcl, "Electrical Power Measurement: can not get NeutralCurrent, feature is not supported"));
214+
ReturnErrorOnFailure(aEncoder.Encode(mDelegate.GetNeutralCurrent()));
215+
break;
216+
}
206217
return CHIP_NO_ERROR;
207218
}
208219

‎src/app/clusters/electrical-power-measurement-server/electrical-power-measurement-server.h

+24-24
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ namespace ElectricalPowerMeasurement {
3030
using namespace chip::app::Clusters::ElectricalPowerMeasurement::Attributes;
3131
using namespace chip::app::Clusters::ElectricalPowerMeasurement::Structs;
3232

33-
3433
using chip::Protocols::InteractionModel::Status;
3534

3635
class Delegate
@@ -40,25 +39,25 @@ class Delegate
4039

4140
void SetEndpointId(EndpointId aEndpoint) { mEndpointId = aEndpoint; }
4241

43-
virtual PowerModeEnum GetPowerMode() = 0;
44-
virtual uint8_t GetNumberOfMeasurementTypes() = 0;
45-
virtual DataModel::List<const Structs::MeasurementAccuracyStruct::Type> GetAccuracy() = 0;
46-
virtual DataModel::List<const Structs::MeasurementRangeStruct::Type> GetRanges() = 0;
47-
virtual DataModel::Nullable<int64_t> GetVoltage() = 0;
48-
virtual DataModel::Nullable<int64_t> GetActiveCurrent() = 0;
49-
virtual DataModel::Nullable<int64_t> GetReactiveCurrent() = 0;
50-
virtual DataModel::Nullable<int64_t> GetApparentCurrent() = 0;
51-
virtual DataModel::Nullable<int64_t> GetActivePower() = 0;
52-
virtual DataModel::Nullable<int64_t> GetReactivePower() = 0;
53-
virtual DataModel::Nullable<int64_t> GetApparentPower() = 0;
54-
virtual DataModel::Nullable<int64_t> GetRMSVoltage() = 0;
55-
virtual DataModel::Nullable<int64_t> GetRMSCurrent() = 0;
56-
virtual DataModel::Nullable<int64_t> GetRMSPower() = 0;
57-
virtual DataModel::Nullable<int64_t> GetFrequency() = 0;
58-
virtual DataModel::Nullable<DataModel::List<Structs::HarmonicMeasurementStruct::Type>> GetHarmonicCurrents() = 0;
59-
virtual DataModel::Nullable<DataModel::List<Structs::HarmonicMeasurementStruct::Type>> GetHarmonicPhases() = 0;
60-
virtual DataModel::Nullable<int64_t> GetPowerFactor() = 0;
61-
virtual DataModel::Nullable<int64_t> GetNeutralCurrent() = 0;
42+
virtual PowerModeEnum GetPowerMode() = 0;
43+
virtual uint8_t GetNumberOfMeasurementTypes() = 0;
44+
virtual DataModel::List<const Structs::MeasurementAccuracyStruct::Type> GetAccuracy() = 0;
45+
virtual DataModel::List<const Structs::MeasurementRangeStruct::Type> GetRanges() = 0;
46+
virtual DataModel::Nullable<int64_t> GetVoltage() = 0;
47+
virtual DataModel::Nullable<int64_t> GetActiveCurrent() = 0;
48+
virtual DataModel::Nullable<int64_t> GetReactiveCurrent() = 0;
49+
virtual DataModel::Nullable<int64_t> GetApparentCurrent() = 0;
50+
virtual DataModel::Nullable<int64_t> GetActivePower() = 0;
51+
virtual DataModel::Nullable<int64_t> GetReactivePower() = 0;
52+
virtual DataModel::Nullable<int64_t> GetApparentPower() = 0;
53+
virtual DataModel::Nullable<int64_t> GetRMSVoltage() = 0;
54+
virtual DataModel::Nullable<int64_t> GetRMSCurrent() = 0;
55+
virtual DataModel::Nullable<int64_t> GetRMSPower() = 0;
56+
virtual DataModel::Nullable<int64_t> GetFrequency() = 0;
57+
virtual DataModel::Nullable<DataModel::List<Structs::HarmonicMeasurementStruct::Type>> GetHarmonicCurrents() = 0;
58+
virtual DataModel::Nullable<DataModel::List<Structs::HarmonicMeasurementStruct::Type>> GetHarmonicPhases() = 0;
59+
virtual DataModel::Nullable<int64_t> GetPowerFactor() = 0;
60+
virtual DataModel::Nullable<int64_t> GetNeutralCurrent() = 0;
6261

6362
protected:
6463
EndpointId mEndpointId = 0;
@@ -85,24 +84,25 @@ class Instance : public AttributeAccessInterface
8584
{
8685
public:
8786
Instance(EndpointId aEndpointId, Delegate & aDelegate, Feature aFeature, OptionalAttributes aOptionalAttributes) :
88-
AttributeAccessInterface(MakeOptional(aEndpointId), Id), mDelegate(aDelegate), mFeature(aFeature), mOptionalAttrs(aOptionalAttributes)
87+
AttributeAccessInterface(MakeOptional(aEndpointId), Id), mDelegate(aDelegate), mFeature(aFeature),
88+
mOptionalAttrs(aOptionalAttributes)
8989
{
9090
/* set the base class delegates endpointId */
9191
mDelegate.SetEndpointId(aEndpointId);
9292
}
9393
~Instance() { Shutdown(); }
9494

95-
CHIP_ERROR Init();
95+
CHIP_ERROR Init();
9696
void Shutdown();
9797

9898
bool HasFeature(Feature aFeature) const;
9999
bool SupportsOptAttr(OptionalAttributes aOptionalAttrs) const;
100100

101101
private:
102-
Delegate & mDelegate;
102+
Delegate & mDelegate;
103103
BitMask<Feature> mFeature;
104104
BitMask<OptionalAttributes> mOptionalAttrs;
105-
105+
106106
// AttributeAccessInterface
107107
CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
108108
};

0 commit comments

Comments
 (0)