Skip to content

Commit b5521d2

Browse files
Add a constructor in QuieterReporting that works with arrays
1 parent 4f0dcc4 commit b5521d2

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

src/app/cluster-building-blocks/QuieterReporting.h

+2
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ class QuieterReportingAttribute
112112
{
113113
public:
114114
explicit QuieterReportingAttribute(const Nullable<T> & initialValue) : mValue(initialValue), mLastDirtyValue(initialValue) {}
115+
// constructor that works with arrays of QuieterReportingAttribute
116+
explicit QuieterReportingAttribute() : mValue(Nullable<T>(0)), mLastDirtyValue(Nullable<T>(0)) {}
115117

116118
struct SufficientChangePredicateCandidate
117119
{

src/app/clusters/color-control-server/color-control-server.h

+6-18
Original file line numberDiff line numberDiff line change
@@ -295,37 +295,25 @@ class ColorControlServer
295295
ColorHueTransitionState colorHueTransitionStates[kColorControlClusterServerMaxEndpointCount];
296296
Color16uTransitionState colorSatTransitionStates[kColorControlClusterServerMaxEndpointCount];
297297

298-
chip::app::QuieterReportingAttribute<uint8_t> quietHue[kColorControlClusterServerMaxEndpointCount]{
299-
chip::app::QuieterReportingAttribute<uint8_t>(0)
300-
};
301-
chip::app::QuieterReportingAttribute<uint8_t> quietSaturation[kColorControlClusterServerMaxEndpointCount]{
302-
chip::app::QuieterReportingAttribute<uint8_t>(0)
303-
};
304-
chip::app::QuieterReportingAttribute<uint16_t> quietEnhancedHue[kColorControlClusterServerMaxEndpointCount]{
305-
chip::app::QuieterReportingAttribute<uint16_t>(0)
306-
};
298+
chip::app::QuieterReportingAttribute<uint8_t> quietHue[kColorControlClusterServerMaxEndpointCount];
299+
chip::app::QuieterReportingAttribute<uint8_t> quietSaturation[kColorControlClusterServerMaxEndpointCount];
300+
chip::app::QuieterReportingAttribute<uint16_t> quietEnhancedHue[kColorControlClusterServerMaxEndpointCount];
307301
#endif
308302

309303
#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY
310304
Color16uTransitionState colorXtransitionStates[kColorControlClusterServerMaxEndpointCount];
311305
Color16uTransitionState colorYtransitionStates[kColorControlClusterServerMaxEndpointCount];
312306

313-
chip::app::QuieterReportingAttribute<uint16_t> quietColorX[kColorControlClusterServerMaxEndpointCount]{
314-
chip::app::QuieterReportingAttribute<uint16_t>(0)
315-
};
316-
chip::app::QuieterReportingAttribute<uint16_t> quietColorY[kColorControlClusterServerMaxEndpointCount]{
317-
chip::app::QuieterReportingAttribute<uint16_t>(0)
318-
};
307+
chip::app::QuieterReportingAttribute<uint16_t> quietColorX[kColorControlClusterServerMaxEndpointCount];
308+
chip::app::QuieterReportingAttribute<uint16_t> quietColorY[kColorControlClusterServerMaxEndpointCount];
319309
#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_XY
320310

321311
#ifdef MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP
322312
Color16uTransitionState colorTempTransitionStates[kColorControlClusterServerMaxEndpointCount];
323313
#endif // MATTER_DM_PLUGIN_COLOR_CONTROL_SERVER_TEMP
324314

325315
EmberEventControl eventControls[kColorControlClusterServerMaxEndpointCount];
326-
chip::app::QuieterReportingAttribute<uint16_t> quietRemainingTime[kColorControlClusterServerMaxEndpointCount]{
327-
chip::app::QuieterReportingAttribute<uint16_t>(0)
328-
};
316+
chip::app::QuieterReportingAttribute<uint16_t> quietRemainingTime[kColorControlClusterServerMaxEndpointCount];
329317

330318
#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
331319
friend class DefaultColorControlSceneHandler;

0 commit comments

Comments
 (0)