Skip to content

Commit 5acad83

Browse files
lazarkovlazarkov
authored
Merge branch 'master' into feature/add-logic-message-cluster
2 parents 094f6fb + 71fe503 commit 5acad83

File tree

88 files changed

+692
-690
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+692
-690
lines changed

‎examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class StaticSupportedModesManager : public chip::app::Clusters::ModeSelect::Supp
5050
};
5151

5252
static storage_value_type coffeeOptions[];
53-
static const EndpointSpanPair supportedOptionsByEndpoints[EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT];
53+
static const EndpointSpanPair supportedOptionsByEndpoints[MATTER_DM_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT];
5454

5555
public:
5656
static const StaticSupportedModesManager instance;

‎examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class AppSupportedTemperatureLevelsDelegate : public SupportedTemperatureLevelsI
4949
static CharSpan temperatureLevelOptions[3];
5050

5151
public:
52-
static const EndpointPair supportedOptionsByEndpoints[EMBER_AF_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT];
52+
static const EndpointPair supportedOptionsByEndpoints[MATTER_DM_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT];
5353

5454
uint8_t Size() override;
5555

‎examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ storage_value_type StaticSupportedModesManager::coffeeOptions[] = {
3535
buildModeOptionStruct("Espresso", 7, List<const SemanticTag>(semanticTagsEspresso))
3636
};
3737
const StaticSupportedModesManager::EndpointSpanPair
38-
StaticSupportedModesManager::supportedOptionsByEndpoints[EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT] = {
38+
StaticSupportedModesManager::supportedOptionsByEndpoints[MATTER_DM_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT] = {
3939
EndpointSpanPair(1, Span<storage_value_type>(StaticSupportedModesManager::coffeeOptions)) // Options for Endpoint 1
4040
};
4141

‎examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ CharSpan AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions[] = { Ch
3030
CharSpan("Freezing", 8) };
3131

3232
const AppSupportedTemperatureLevelsDelegate::EndpointPair AppSupportedTemperatureLevelsDelegate::supportedOptionsByEndpoints
33-
[EMBER_AF_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT] = {
33+
[MATTER_DM_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT] = {
3434
EndpointPair(1, AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions, 3) // Options for Endpoint 1
3535
};
3636

‎examples/all-clusters-app/linux/include/CHIPProjectAppConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DEVICE_TYPE 1
4242

4343
// Marks that a ModeBase Derived cluster is being used.
44-
#define EMBER_AF_PLUGIN_MODE_BASE
44+
#define MATTER_DM_PLUGIN_MODE_BASE
4545

4646
// Enable batching of up to 5 commands.
4747
#define CHIP_CONFIG_MAX_PATHS_PER_INVOKE 5

‎examples/all-clusters-app/linux/main-common.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ const Clusters::Descriptor::Structs::SemanticTagStruct::Type gEp2TagList[] = {
104104
};
105105
} // namespace
106106

107-
#ifdef EMBER_AF_PLUGIN_DISHWASHER_ALARM_SERVER
107+
#ifdef MATTER_DM_PLUGIN_DISHWASHER_ALARM_SERVER
108108
extern void MatterDishwasherAlarmServerInit();
109109
#endif
110110

@@ -225,7 +225,7 @@ void ApplicationInit()
225225
SetDeviceInstanceInfoProvider(&gExampleDeviceInstanceInfoProvider);
226226
}
227227

228-
#ifdef EMBER_AF_PLUGIN_DISHWASHER_ALARM_SERVER
228+
#ifdef MATTER_DM_PLUGIN_DISHWASHER_ALARM_SERVER
229229
MatterDishwasherAlarmServerInit();
230230
#endif
231231
Clusters::TemperatureControl::SetInstance(&sAppSupportedTemperatureLevelsDelegate);

‎examples/chef/common/chef-air-quality.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ using namespace chip;
2525
using namespace chip::app;
2626
using namespace chip::app::Clusters;
2727

28-
#ifdef EMBER_AF_PLUGIN_AIR_QUALITY_SERVER
28+
#ifdef MATTER_DM_PLUGIN_AIR_QUALITY_SERVER
2929
#include <app/clusters/air-quality-server/air-quality-server.h>
3030
using namespace chip::app::Clusters::AirQuality;
3131

‎examples/chef/common/chef-air-quality.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <app/util/config.h>
2222
#include <lib/core/DataModelTypes.h>
2323

24-
#ifdef EMBER_AF_PLUGIN_AIR_QUALITY_SERVER
24+
#ifdef MATTER_DM_PLUGIN_AIR_QUALITY_SERVER
2525
EmberAfStatus chefAirQualityWriteCallback(chip::EndpointId endpoint, chip::ClusterId clusterId,
2626
const EmberAfAttributeMetadata * attributeMetadata, uint8_t * buffer);
2727
EmberAfStatus chefAirQualityReadCallback(chip::EndpointId endpoint, chip::ClusterId clusterId,

‎examples/chef/common/chef-channel-manager.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ using ChangeChannelResponseType = chip::app::Clusters::Channel::Commands::Change
2323
using ChannelInfoType = chip::app::Clusters::Channel::Structs::ChannelInfoStruct::Type;
2424
using LineupInfoType = chip::app::Clusters::Channel::Structs::LineupInfoStruct::Type;
2525
// Include Channel Cluster Server callbacks only when the server is enabled
26-
#ifdef EMBER_AF_PLUGIN_CHANNEL_SERVER
26+
#ifdef MATTER_DM_PLUGIN_CHANNEL_SERVER
2727
#include <chef-channel-manager.h>
2828

2929
using namespace chip;
@@ -213,7 +213,7 @@ bool ChefChannelManager::HandleSkipChannel(const int16_t & count)
213213

214214
uint32_t ChefChannelManager::GetFeatureMap(chip::EndpointId endpoint)
215215
{
216-
if (endpoint > EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT)
216+
if (endpoint > MATTER_DM_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT)
217217
{
218218
return 0;
219219
}
@@ -223,4 +223,4 @@ uint32_t ChefChannelManager::GetFeatureMap(chip::EndpointId endpoint)
223223
return featureMap;
224224
}
225225

226-
#endif /* EMBER_AF_PLUGIN_CHANNEL_SERVER */
226+
#endif /* MATTER_DM_PLUGIN_CHANNEL_SERVER */

‎examples/chef/common/chef-concentration-measurement.cpp

+20-20
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ using namespace chip::app;
2727
using namespace chip::app::DataModel;
2828
using namespace chip::app::Clusters;
2929

30-
#if defined(EMBER_AF_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \
31-
defined(EMBER_AF_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \
32-
defined(EMBER_AF_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \
33-
defined(EMBER_AF_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER) || \
34-
defined(EMBER_AF_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER) || \
35-
defined(EMBER_AF_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER) || \
36-
defined(EMBER_AF_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER) || \
37-
defined(EMBER_AF_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER) || \
38-
defined(EMBER_AF_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER) || \
39-
defined(EMBER_AF_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER)
30+
#if defined(MATTER_DM_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \
31+
defined(MATTER_DM_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \
32+
defined(MATTER_DM_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \
33+
defined(MATTER_DM_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER) || \
34+
defined(MATTER_DM_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER) || \
35+
defined(MATTER_DM_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER) || \
36+
defined(MATTER_DM_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER) || \
37+
defined(MATTER_DM_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER) || \
38+
defined(MATTER_DM_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER) || \
39+
defined(MATTER_DM_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER)
4040
#include <app/clusters/concentration-measurement-server/concentration-measurement-server.h>
4141
using namespace chip::app::Clusters::ConcentrationMeasurement;
4242

@@ -184,7 +184,7 @@ EmberAfStatus chefConcentrationMeasurementReadCallback(chip::EndpointId endpoint
184184
}
185185
#endif
186186

187-
#ifdef EMBER_AF_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER
187+
#ifdef MATTER_DM_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER
188188
void emberAfCarbonMonoxideConcentrationMeasurementClusterInitCallback(EndpointId endpoint)
189189
{
190190
gCarbonMonoxideConcentrationMeasurementInstance[EndpointId(endpoint)] = new Instance<true, true, true, true, true, true>(
@@ -202,7 +202,7 @@ void emberAfCarbonMonoxideConcentrationMeasurementClusterInitCallback(EndpointId
202202
}
203203
#endif
204204

205-
#ifdef EMBER_AF_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER
205+
#ifdef MATTER_DM_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER
206206
void emberAfCarbonDioxideConcentrationMeasurementClusterInitCallback(EndpointId endpoint)
207207
{
208208
gCarbonDioxideConcentrationMeasurementInstance[EndpointId(endpoint)] = new Instance<true, true, true, true, true, true>(
@@ -220,7 +220,7 @@ void emberAfCarbonDioxideConcentrationMeasurementClusterInitCallback(EndpointId
220220
}
221221
#endif
222222

223-
#ifdef EMBER_AF_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER
223+
#ifdef MATTER_DM_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER
224224
void emberAfNitrogenDioxideConcentrationMeasurementClusterInitCallback(EndpointId endpoint)
225225
{
226226
gNitrogenDioxideConcentrationMeasurementInstance[EndpointId(endpoint)] = new Instance<true, true, true, true, true, true>(
@@ -238,7 +238,7 @@ void emberAfNitrogenDioxideConcentrationMeasurementClusterInitCallback(EndpointI
238238
}
239239
#endif
240240

241-
#ifdef EMBER_AF_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER
241+
#ifdef MATTER_DM_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER
242242
void emberAfOzoneConcentrationMeasurementClusterInitCallback(EndpointId endpoint)
243243
{
244244
gOzoneConcentrationMeasurementInstance[EndpointId(endpoint)] = new Instance<true, true, true, true, true, true>(
@@ -256,7 +256,7 @@ void emberAfOzoneConcentrationMeasurementClusterInitCallback(EndpointId endpoint
256256
}
257257
#endif
258258

259-
#ifdef EMBER_AF_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER
259+
#ifdef MATTER_DM_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER
260260
void emberAfPm25ConcentrationMeasurementClusterInitCallback(EndpointId endpoint)
261261
{
262262
gPm25ConcentrationMeasurementInstance[EndpointId(endpoint)] = new Instance<true, true, true, true, true, true>(
@@ -274,7 +274,7 @@ void emberAfPm25ConcentrationMeasurementClusterInitCallback(EndpointId endpoint)
274274
}
275275
#endif
276276

277-
#ifdef EMBER_AF_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER
277+
#ifdef MATTER_DM_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER
278278
void emberAfFormaldehydeConcentrationMeasurementClusterInitCallback(EndpointId endpoint)
279279
{
280280
gFormaldehydeConcentrationMeasurementInstance[EndpointId(endpoint)] = new Instance<true, true, true, true, true, true>(
@@ -292,7 +292,7 @@ void emberAfFormaldehydeConcentrationMeasurementClusterInitCallback(EndpointId e
292292
}
293293
#endif
294294

295-
#ifdef EMBER_AF_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER
295+
#ifdef MATTER_DM_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER
296296
void emberAfPm1ConcentrationMeasurementClusterInitCallback(EndpointId endpoint)
297297
{
298298
gPm1ConcentrationMeasurementInstance[EndpointId(endpoint)] = new Instance<true, true, true, true, true, true>(
@@ -310,7 +310,7 @@ void emberAfPm1ConcentrationMeasurementClusterInitCallback(EndpointId endpoint)
310310
}
311311
#endif
312312

313-
#ifdef EMBER_AF_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER
313+
#ifdef MATTER_DM_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER
314314
void emberAfPm10ConcentrationMeasurementClusterInitCallback(EndpointId endpoint)
315315
{
316316
gPm10ConcentrationMeasurementInstance[EndpointId(endpoint)] = new Instance<true, true, true, true, true, true>(
@@ -328,7 +328,7 @@ void emberAfPm10ConcentrationMeasurementClusterInitCallback(EndpointId endpoint)
328328
}
329329
#endif
330330

331-
#ifdef EMBER_AF_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER
331+
#ifdef MATTER_DM_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER
332332
void emberAfRadonConcentrationMeasurementClusterInitCallback(EndpointId endpoint)
333333
{
334334
gRadonConcentrationMeasurementInstance[EndpointId(endpoint)] = new Instance<true, true, true, true, true, true>(
@@ -346,7 +346,7 @@ void emberAfRadonConcentrationMeasurementClusterInitCallback(EndpointId endpoint
346346
}
347347
#endif
348348

349-
#ifdef EMBER_AF_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER
349+
#ifdef MATTER_DM_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER
350350
void emberAfTotalVolatileOrganicCompoundsConcentrationMeasurementClusterInitCallback(EndpointId endpoint)
351351
{
352352
gTotalVolatileOrganicCompoundsConcentrationMeasurementInstance[EndpointId(endpoint)] =

‎examples/chef/common/chef-concentration-measurement.h

+10-10
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
#include <app/util/config.h>
2222
#include <lib/core/DataModelTypes.h>
2323

24-
#if defined(EMBER_AF_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \
25-
defined(EMBER_AF_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \
26-
defined(EMBER_AF_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \
27-
defined(EMBER_AF_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER) || \
28-
defined(EMBER_AF_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER) || \
29-
defined(EMBER_AF_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER) || \
30-
defined(EMBER_AF_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER) || \
31-
defined(EMBER_AF_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER) || \
32-
defined(EMBER_AF_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER) || \
33-
defined(EMBER_AF_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER)
24+
#if defined(MATTER_DM_PLUGIN_CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \
25+
defined(MATTER_DM_PLUGIN_CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \
26+
defined(MATTER_DM_PLUGIN_NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_SERVER) || \
27+
defined(MATTER_DM_PLUGIN_OZONE_CONCENTRATION_MEASUREMENT_SERVER) || \
28+
defined(MATTER_DM_PLUGIN_PM2__5_CONCENTRATION_MEASUREMENT_SERVER) || \
29+
defined(MATTER_DM_PLUGIN_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_SERVER) || \
30+
defined(MATTER_DM_PLUGIN_PM1_CONCENTRATION_MEASUREMENT_SERVER) || \
31+
defined(MATTER_DM_PLUGIN_PM10_CONCENTRATION_MEASUREMENT_SERVER) || \
32+
defined(MATTER_DM_PLUGIN_TOTAL_VOLATILE_ORGANIC_COMPOUNDS_CONCENTRATION_MEASUREMENT_SERVER) || \
33+
defined(MATTER_DM_PLUGIN_RADON_CONCENTRATION_MEASUREMENT_SERVER)
3434
EmberAfStatus chefConcentrationMeasurementWriteCallback(chip::EndpointId endpoint, chip::ClusterId clusterId,
3535
const EmberAfAttributeMetadata * attributeMetadata, uint8_t * buffer);
3636
EmberAfStatus chefConcentrationMeasurementReadCallback(chip::EndpointId endpoint, chip::ClusterId clusterId,

‎examples/chef/common/chef-rvc-operational-state-delegate.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,4 +167,4 @@ void emberAfRvcOperationalStateClusterInitCallback(chip::EndpointId endpointId)
167167

168168
gRvcOperationalStateInstance->Init();
169169
}
170-
#endif // EMBER_AF_PLUGIN_RVC_OPERATIONAL_STATE_SERVER
170+
#endif // MATTER_DM_PLUGIN_RVC_OPERATIONAL_STATE_SERVER

0 commit comments

Comments
 (0)