Skip to content

Commit 67b5637

Browse files
raul-marquez-csaraul-marquez-csa
authored
Merge branch 'master' into TC-SC-4.3-python-test
2 parents de2557a + 4597a3b commit 67b5637

File tree

100 files changed

+622
-529
lines changed

Some content is hidden

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

100 files changed

+622
-529
lines changed

‎examples/air-purifier-app/air-purifier-common/include/relative-humidity-sensor-manager.h

+7-5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#pragma once
2020

2121
#include <app-common/zap-generated/attributes/Accessors.h>
22+
#include <protocols/interaction_model/StatusCode.h>
2223

2324
namespace chip {
2425
namespace app {
@@ -31,19 +32,20 @@ class RelativeHumiditySensorManager
3132

3233
void Init()
3334
{
34-
EmberAfStatus status = RelativeHumidityMeasurement::Attributes::MinMeasuredValue::Set(mEndpointId, 0);
35-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
35+
Protocols::InteractionModel::Status status = RelativeHumidityMeasurement::Attributes::MinMeasuredValue::Set(mEndpointId, 0);
36+
VerifyOrReturn(Protocols::InteractionModel::Status::Success == status,
3637
ChipLogError(NotSpecified, "Failed to set RelativeHumidityMeasurement MinMeasuredValue attribute"));
3738

3839
status = RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::Set(mEndpointId, 10000);
39-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
40+
VerifyOrReturn(Protocols::InteractionModel::Status::Success == status,
4041
ChipLogError(NotSpecified, "Failed to set RelativeHumidityMeasurement MaxMeasuredValue attribute"));
4142
};
4243

4344
void OnHumidityChangeHandler(uint16_t newValue)
4445
{
45-
EmberAfStatus status = RelativeHumidityMeasurement::Attributes::MeasuredValue::Set(mEndpointId, newValue);
46-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
46+
Protocols::InteractionModel::Status status =
47+
RelativeHumidityMeasurement::Attributes::MeasuredValue::Set(mEndpointId, newValue);
48+
VerifyOrReturn(Protocols::InteractionModel::Status::Success == status,
4749
ChipLogError(NotSpecified, "Failed to set RelativeHumidityMeasurement MeasuredValue attribute"));
4850
ChipLogDetail(NotSpecified, "The new RelativeHumidityMeasurement value: %d", newValue);
4951
}

‎examples/air-purifier-app/air-purifier-common/include/temperature-sensor-manager.h

+6-5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#pragma once
2020

2121
#include <app-common/zap-generated/attributes/Accessors.h>
22+
#include <protocols/interaction_model/StatusCode.h>
2223

2324
namespace chip {
2425
namespace app {
@@ -31,19 +32,19 @@ class TemperatureSensorManager
3132

3233
void Init()
3334
{
34-
EmberAfStatus status = TemperatureMeasurement::Attributes::MinMeasuredValue::Set(mEndpointId, -500);
35-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
35+
Protocols::InteractionModel::Status status = TemperatureMeasurement::Attributes::MinMeasuredValue::Set(mEndpointId, -500);
36+
VerifyOrReturn(Protocols::InteractionModel::Status::Success == status,
3637
ChipLogError(NotSpecified, "Failed to set TemperatureMeasurement MinMeasuredValue attribute"));
3738

3839
status = TemperatureMeasurement::Attributes::MaxMeasuredValue::Set(mEndpointId, 6000);
39-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
40+
VerifyOrReturn(Protocols::InteractionModel::Status::Success == status,
4041
ChipLogError(NotSpecified, "Failed to set TemperatureMeasurement MaxMeasuredValue attribute"));
4142
}
4243

4344
void OnTemperatureChangeHandler(int16_t newValue)
4445
{
45-
EmberAfStatus status = TemperatureMeasurement::Attributes::MeasuredValue::Set(mEndpointId, newValue);
46-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
46+
Protocols::InteractionModel::Status status = TemperatureMeasurement::Attributes::MeasuredValue::Set(mEndpointId, newValue);
47+
VerifyOrReturn(Protocols::InteractionModel::Status::Success == status,
4748
ChipLogError(NotSpecified, "Failed to set TemperatureMeasurement MeasuredValue attribute"));
4849
ChipLogDetail(NotSpecified, "The new TemperatureMeasurement value: %d", newValue);
4950
}

‎examples/air-purifier-app/air-purifier-common/src/air-purifier-manager.cpp

+21-17
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,13 @@ void AirPurifierManager::PercentSettingWriteCallback(uint8_t aNewPercentSetting)
196196
if (aNewPercentSetting != percentCurrent)
197197
{
198198
ChipLogDetail(NotSpecified, "AirPurifierManager::PercentSettingWriteCallback: %d", aNewPercentSetting);
199-
percentCurrent = aNewPercentSetting;
200-
EmberAfStatus status = FanControl::Attributes::PercentCurrent::Set(mEndpointId, percentCurrent);
201-
if (status != EMBER_ZCL_STATUS_SUCCESS)
199+
percentCurrent = aNewPercentSetting;
200+
Status status = FanControl::Attributes::PercentCurrent::Set(mEndpointId, percentCurrent);
201+
if (status != Status::Success)
202202
{
203203
ChipLogError(NotSpecified,
204-
"AirPurifierManager::PercentSettingWriteCallback: failed to set PercentCurrent attribute: %d", status);
204+
"AirPurifierManager::PercentSettingWriteCallback: failed to set PercentCurrent attribute: %d",
205+
to_underlying(status));
205206
}
206207
}
207208
}
@@ -211,12 +212,12 @@ void AirPurifierManager::SpeedSettingWriteCallback(uint8_t aNewSpeedSetting)
211212
if (aNewSpeedSetting != speedCurrent)
212213
{
213214
ChipLogDetail(NotSpecified, "AirPurifierManager::SpeedSettingWriteCallback: %d", aNewSpeedSetting);
214-
speedCurrent = aNewSpeedSetting;
215-
EmberAfStatus status = FanControl::Attributes::SpeedCurrent::Set(mEndpointId, speedCurrent);
216-
if (status != EMBER_ZCL_STATUS_SUCCESS)
215+
speedCurrent = aNewSpeedSetting;
216+
Status status = FanControl::Attributes::SpeedCurrent::Set(mEndpointId, speedCurrent);
217+
if (status != Status::Success)
217218
{
218219
ChipLogError(NotSpecified, "AirPurifierManager::SpeedSettingWriteCallback: failed to set SpeedCurrent attribute: %d",
219-
status);
220+
to_underlying(status));
220221
}
221222

222223
// Determine if the speed change should also change the fan mode
@@ -299,22 +300,24 @@ void AirPurifierManager::SetSpeedSetting(DataModel::Nullable<uint8_t> aNewSpeedS
299300

300301
if (aNewSpeedSetting.Value() != speedCurrent)
301302
{
302-
EmberAfStatus status = FanControl::Attributes::SpeedSetting::Set(mEndpointId, aNewSpeedSetting);
303-
if (status != EMBER_ZCL_STATUS_SUCCESS)
303+
Status status = FanControl::Attributes::SpeedSetting::Set(mEndpointId, aNewSpeedSetting);
304+
if (status != Status::Success)
304305
{
305-
ChipLogError(NotSpecified, "AirPurifierManager::SetSpeedSetting: failed to set SpeedSetting attribute: %d", status);
306+
ChipLogError(NotSpecified, "AirPurifierManager::SetSpeedSetting: failed to set SpeedSetting attribute: %d",
307+
to_underlying(status));
306308
}
307309
}
308310
}
309311

310312
DataModel::Nullable<uint8_t> AirPurifierManager::GetSpeedSetting()
311313
{
312314
DataModel::Nullable<uint8_t> speedSetting;
313-
EmberAfStatus status = FanControl::Attributes::SpeedSetting::Get(mEndpointId, speedSetting);
315+
Status status = FanControl::Attributes::SpeedSetting::Get(mEndpointId, speedSetting);
314316

315-
if (status != EMBER_ZCL_STATUS_SUCCESS)
317+
if (status != Status::Success)
316318
{
317-
ChipLogError(NotSpecified, "AirPurifierManager::GetSpeedSetting: failed to get SpeedSetting attribute: %d", status);
319+
ChipLogError(NotSpecified, "AirPurifierManager::GetSpeedSetting: failed to get SpeedSetting attribute: %d",
320+
to_underlying(status));
318321
}
319322

320323
return speedSetting;
@@ -323,11 +326,12 @@ DataModel::Nullable<uint8_t> AirPurifierManager::GetSpeedSetting()
323326
DataModel::Nullable<Percent> AirPurifierManager::GetPercentSetting()
324327
{
325328
DataModel::Nullable<Percent> percentSetting;
326-
EmberAfStatus status = FanControl::Attributes::PercentSetting::Get(mEndpointId, percentSetting);
329+
Status status = FanControl::Attributes::PercentSetting::Get(mEndpointId, percentSetting);
327330

328-
if (status != EMBER_ZCL_STATUS_SUCCESS)
331+
if (status != Status::Success)
329332
{
330-
ChipLogError(NotSpecified, "AirPurifierManager::GetPercentSetting: failed to get PercentSetting attribute: %d", status);
333+
ChipLogError(NotSpecified, "AirPurifierManager::GetPercentSetting: failed to get PercentSetting attribute: %d",
334+
to_underlying(status));
331335
}
332336

333337
return percentSetting;

‎examples/air-purifier-app/air-purifier-common/src/thermostat-manager.cpp

+19-18
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
*/
1818

1919
#include "thermostat-manager.h"
20+
#include <protocols/interaction_model/StatusCode.h>
21+
22+
using chip::Protocols::InteractionModel::Status;
2023

2124
using namespace chip;
2225
using namespace chip::app;
@@ -26,28 +29,28 @@ void ThermostatManager::Init()
2629
{
2730
BitMask<Thermostat::Feature> FeatureMap;
2831
FeatureMap.Set(Thermostat::Feature::kHeating);
29-
EmberAfStatus status = Thermostat::Attributes::FeatureMap::Set(mEndpointId, FeatureMap.Raw());
32+
Status status = Thermostat::Attributes::FeatureMap::Set(mEndpointId, FeatureMap.Raw());
3033

3134
status = Thermostat::Attributes::ControlSequenceOfOperation::Set(mEndpointId,
3235
Thermostat::ControlSequenceOfOperationEnum::kHeatingOnly);
33-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
36+
VerifyOrReturn(Status::Success == status,
3437
ChipLogError(NotSpecified, "Failed to set Thermostat ControlSequenceOfOperation attribute"));
3538

3639
status = Thermostat::Attributes::AbsMinHeatSetpointLimit::Set(mEndpointId, 500);
37-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
40+
VerifyOrReturn(Status::Success == status,
3841
ChipLogError(NotSpecified, "Failed to set Thermostat MinHeatSetpointLimit attribute"));
3942

4043
status = Thermostat::Attributes::AbsMaxHeatSetpointLimit::Set(mEndpointId, 3000);
41-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
44+
VerifyOrReturn(Status::Success == status,
4245
ChipLogError(NotSpecified, "Failed to set Thermostat MaxHeatSetpointLimit attribute"));
4346
}
4447

4548
void ThermostatManager::HeatingSetpointWriteCallback(int16_t newValue)
4649
{
4750
ChipLogDetail(NotSpecified, "ThermostatManager::HeatingSetpointWriteCallback: %d", newValue);
4851
Thermostat::SystemModeEnum systemMode;
49-
EmberAfStatus status = Thermostat::Attributes::SystemMode::Get(mEndpointId, &systemMode);
50-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status, ChipLogError(NotSpecified, "Failed to get Thermostat SystemMode attribute"));
52+
Status status = Thermostat::Attributes::SystemMode::Get(mEndpointId, &systemMode);
53+
VerifyOrReturn(Status::Success == status, ChipLogError(NotSpecified, "Failed to get Thermostat SystemMode attribute"));
5154

5255
// A new setpoint has been set, so we shall infer that the we want to be in Heating mode
5356
if (systemMode == Thermostat::SystemModeEnum::kOff)
@@ -58,7 +61,7 @@ void ThermostatManager::HeatingSetpointWriteCallback(int16_t newValue)
5861
// Check the current temperature and turn on the heater if needed
5962
DataModel::Nullable<int16_t> localTemperature;
6063
status = Thermostat::Attributes::LocalTemperature::Get(mEndpointId, localTemperature);
61-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
64+
VerifyOrReturn(Status::Success == status,
6265
ChipLogError(NotSpecified, "Failed to get TemperatureMeasurement MeasuredValue attribute"));
6366

6467
if (localTemperature.Value() < newValue)
@@ -81,14 +84,13 @@ void ThermostatManager::SystemModeWriteCallback(uint8_t newValue)
8184
else if ((Thermostat::SystemModeEnum) newValue == Thermostat::SystemModeEnum::kHeat)
8285
{
8386
DataModel::Nullable<int16_t> localTemperature;
84-
EmberAfStatus status = Thermostat::Attributes::LocalTemperature::Get(mEndpointId, localTemperature);
85-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
87+
Status status = Thermostat::Attributes::LocalTemperature::Get(mEndpointId, localTemperature);
88+
VerifyOrReturn(Status::Success == status,
8689
ChipLogError(NotSpecified, "Failed to get TemperatureMeasurement MeasuredValue attribute"));
8790

8891
int16_t heatingSetpoint;
8992
status = Thermostat::Attributes::OccupiedHeatingSetpoint::Get(mEndpointId, &heatingSetpoint);
90-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
91-
ChipLogError(NotSpecified, "Failed to get Thermostat HeatingSetpoint attribute"));
93+
VerifyOrReturn(Status::Success == status, ChipLogError(NotSpecified, "Failed to get Thermostat HeatingSetpoint attribute"));
9294

9395
if (localTemperature.Value() < heatingSetpoint)
9496
{
@@ -99,8 +101,8 @@ void ThermostatManager::SystemModeWriteCallback(uint8_t newValue)
99101

100102
void ThermostatManager::OnLocalTemperatureChangeCallback(int16_t temperature)
101103
{
102-
EmberAfStatus status = Thermostat::Attributes::LocalTemperature::Set(mEndpointId, temperature);
103-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
104+
Status status = Thermostat::Attributes::LocalTemperature::Set(mEndpointId, temperature);
105+
VerifyOrReturn(Status::Success == status,
104106
ChipLogError(NotSpecified, "Failed to set TemperatureMeasurement MeasuredValue attribute"));
105107
}
106108

@@ -122,14 +124,13 @@ void ThermostatManager::SetHeating(bool isHeating)
122124
runningState.Clear(Thermostat::RelayStateBitmap::kHeat);
123125
}
124126

125-
EmberAfStatus status = Thermostat::Attributes::ThermostatRunningState::Set(mEndpointId, runningState);
126-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
127-
ChipLogError(NotSpecified, "Failed to set Thermostat RunningState attribute"));
127+
Status status = Thermostat::Attributes::ThermostatRunningState::Set(mEndpointId, runningState);
128+
VerifyOrReturn(Status::Success == status, ChipLogError(NotSpecified, "Failed to set Thermostat RunningState attribute"));
128129
}
129130

130131
void ThermostatManager::SetHeatMode(bool heat)
131132
{
132-
EmberAfStatus status = Thermostat::Attributes::SystemMode::Set(
133+
Status status = Thermostat::Attributes::SystemMode::Set(
133134
mEndpointId, heat ? Thermostat::SystemModeEnum::kHeat : Thermostat::SystemModeEnum::kOff);
134-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status, ChipLogError(NotSpecified, "Failed to set Thermostat SystemMode attribute"));
135+
VerifyOrReturn(Status::Success == status, ChipLogError(NotSpecified, "Failed to set Thermostat SystemMode attribute"));
135136
}

‎examples/air-quality-sensor-app/air-quality-sensor-common/include/relative-humidity-sensor-manager.h

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include <app-common/zap-generated/attributes/Accessors.h>
2+
#include <protocols/interaction_model/StatusCode.h>
23

34
#pragma once
45

@@ -11,19 +12,20 @@ class RelativeHumiditySensorManager
1112
public:
1213
RelativeHumiditySensorManager(EndpointId aEndpointId) : mEndpointId(aEndpointId)
1314
{
14-
EmberAfStatus status = RelativeHumidityMeasurement::Attributes::MinMeasuredValue::Set(mEndpointId, 0);
15-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
15+
Protocols::InteractionModel::Status status = RelativeHumidityMeasurement::Attributes::MinMeasuredValue::Set(mEndpointId, 0);
16+
VerifyOrReturn(Protocols::InteractionModel::Status::Success == status,
1617
ChipLogError(NotSpecified, "Failed to set RelativeHumidityMeasurement MinMeasuredValue attribute"));
1718

1819
status = RelativeHumidityMeasurement::Attributes::MaxMeasuredValue::Set(mEndpointId, 100);
19-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
20+
VerifyOrReturn(Protocols::InteractionModel::Status::Success == status,
2021
ChipLogError(NotSpecified, "Failed to set RelativeHumidityMeasurement MaxMeasuredValue attribute"));
2122
};
2223

2324
void OnHumidityChangeHandler(uint16_t newValue)
2425
{
25-
EmberAfStatus status = RelativeHumidityMeasurement::Attributes::MeasuredValue::Set(mEndpointId, newValue);
26-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
26+
Protocols::InteractionModel::Status status =
27+
RelativeHumidityMeasurement::Attributes::MeasuredValue::Set(mEndpointId, newValue);
28+
VerifyOrReturn(Protocols::InteractionModel::Status::Success == status,
2729
ChipLogError(NotSpecified, "Failed to set RelativeHumidityMeasurement MeasuredValue attribute"));
2830
ChipLogDetail(NotSpecified, "The new RelativeHumidityMeasurement value: %d", newValue);
2931
}

‎examples/air-quality-sensor-app/air-quality-sensor-common/include/temperature-sensor-manager.h

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
#include <app-common/zap-generated/attributes/Accessors.h>
21

32
#pragma once
3+
#include <app-common/zap-generated/attributes/Accessors.h>
4+
5+
#include <protocols/interaction_model/StatusCode.h>
46

57
namespace chip {
68
namespace app {
@@ -11,19 +13,19 @@ class TemperatureSensorManager
1113
public:
1214
TemperatureSensorManager(EndpointId aEndpointId) : mEndpointId(aEndpointId)
1315
{
14-
EmberAfStatus status = TemperatureMeasurement::Attributes::MinMeasuredValue::Set(mEndpointId, -5);
15-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
16+
Protocols::InteractionModel::Status status = TemperatureMeasurement::Attributes::MinMeasuredValue::Set(mEndpointId, -5);
17+
VerifyOrReturn(Protocols::InteractionModel::Status::Success == status,
1618
ChipLogError(NotSpecified, "Failed to set TemperatureMeasurement MinMeasuredValue attribute"));
1719

1820
status = TemperatureMeasurement::Attributes::MaxMeasuredValue::Set(mEndpointId, 60);
19-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
21+
VerifyOrReturn(Protocols::InteractionModel::Status::Success == status,
2022
ChipLogError(NotSpecified, "Failed to set TemperatureMeasurement MaxMeasuredValue attribute"));
2123
};
2224

2325
void OnTemperatureChangeHandler(int16_t newValue)
2426
{
25-
EmberAfStatus status = TemperatureMeasurement::Attributes::MeasuredValue::Set(mEndpointId, newValue);
26-
VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status,
27+
Protocols::InteractionModel::Status status = TemperatureMeasurement::Attributes::MeasuredValue::Set(mEndpointId, newValue);
28+
VerifyOrReturn(Protocols::InteractionModel::Status::Success == status,
2729
ChipLogError(NotSpecified, "Failed to set TemperatureMeasurement MeasuredValue attribute"));
2830
ChipLogDetail(NotSpecified, "The new TemperatureMeasurement value: %d", newValue);
2931
}

0 commit comments

Comments
 (0)