Skip to content

Commit 3b3d37b

Browse files
jepenven-silabsjepenven-silabs
authored
Update src/app/util/ emberafstatus (#32054)
1 parent 7cc357e commit 3b3d37b

File tree

37 files changed

+141
-187
lines changed

37 files changed

+141
-187
lines changed

‎.github/workflows/lint.yml

-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ jobs:
137137
--known-failure app/util/ember-compatibility-functions.cpp \
138138
--known-failure app/util/endpoint-config-api.h \
139139
--known-failure app/util/endpoint-config-defines.h \
140-
--known-failure app/util/error-mapping.h \
141140
--known-failure app/util/generic-callbacks.h \
142141
--known-failure app/util/generic-callback-stubs.cpp \
143142
--known-failure app/util/im-client-callbacks.h \

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*/
1818

1919
#include <air-purifier-manager.h>
20-
#include <app/util/error-mapping.h>
2120

2221
using namespace chip;
2322
using namespace chip::app;
@@ -147,7 +146,7 @@ Status AirPurifierManager::HandleStep(FanControl::StepDirectionEnum aDirection,
147146
}
148147
}
149148

150-
return ToInteractionModelStatus(FanControl::Attributes::SpeedSetting::Set(mEndpointId, newSpeedSetting));
149+
return FanControl::Attributes::SpeedSetting::Set(mEndpointId, newSpeedSetting);
151150
}
152151

153152
void AirPurifierManager::HandleFanControlAttributeChange(AttributeId attributeId, uint8_t type, uint16_t size, uint8_t * value)

‎examples/all-clusters-app/all-clusters-common/src/fan-stub.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <app/AttributeAccessInterface.h>
2323
#include <app/clusters/fan-control-server/fan-control-server.h>
2424
#include <app/util/attribute-storage.h>
25-
#include <app/util/error-mapping.h>
2625
#include <lib/support/CodeUtils.h>
2726
#include <lib/support/logging/CHIPLogging.h>
2827

@@ -147,7 +146,7 @@ Status FanControlManager::HandleStep(StepDirectionEnum aDirection, bool aWrap, b
147146
}
148147
}
149148

150-
return ToInteractionModelStatus(SpeedSetting::Set(mEndpoint, newSpeedSetting));
149+
return SpeedSetting::Set(mEndpoint, newSpeedSetting);
151150
}
152151

153152
CHIP_ERROR FanControlManager::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)

‎examples/chef/common/chef-fan-control-manager.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <app/AttributeAccessInterface.h>
2323
#include <app/clusters/fan-control-server/fan-control-server.h>
2424
#include <app/util/attribute-storage.h>
25-
#include <app/util/error-mapping.h>
2625
#include <lib/support/CodeUtils.h>
2726
#include <lib/support/logging/CHIPLogging.h>
2827

@@ -115,7 +114,7 @@ Status ChefFanControlManager::HandleStep(StepDirectionEnum aDirection, bool aWra
115114
});
116115
}
117116

118-
return ToInteractionModelStatus(SpeedSetting::Set(mEndpoint, newSpeedSetting));
117+
return SpeedSetting::Set(mEndpoint, newSpeedSetting);
119118
}
120119

121120
CHIP_ERROR ChefFanControlManager::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)

‎examples/darwin-framework-tool/commands/common/MTRError.mm

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
#import <app/MessageDef/StatusIB.h>
2323
#import <app/util/af-enums.h>
24-
#import <app/util/error-mapping.h>
2524
#import <inet/InetError.h>
2625
#import <lib/support/TypeTraits.h>
2726

‎src/app/clusters/dishwasher-alarm-server/dishwasher-alarm-server.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <app/EventLogging.h>
2424
#include <app/InteractionModelEngine.h>
2525
#include <app/util/attribute-storage.h>
26-
#include <app/util/error-mapping.h>
2726
#include <lib/support/BitFlags.h>
2827

2928
using namespace chip;
@@ -355,7 +354,7 @@ static Status ResetHandler(const app::ConcreteCommandPath & commandPath, const B
355354
if (!DishwasherAlarmServer::Instance().HasResetFeature(endpoint))
356355
{
357356
ChipLogProgress(Zcl, "Dishwasher Alarm feature: Unsupport Reset Command");
358-
return app::ToInteractionModelStatus(EMBER_ZCL_STATUS_UNSUPPORTED_COMMAND);
357+
return EMBER_ZCL_STATUS_UNSUPPORTED_COMMAND;
359358
}
360359

361360
// A server that is unable to reset alarms SHALL respond with a status code of FAILURE

‎src/app/clusters/door-lock-server/door-lock-server.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include <app/server/Server.h>
3030
#include <app/util/af.h>
3131
#include <app/util/attribute-storage.h>
32-
#include <app/util/error-mapping.h>
3332
#include <cinttypes>
3433

3534
#include <app/CommandHandler.h>
@@ -3418,7 +3417,7 @@ void DoorLockServer::sendClusterResponse(chip::app::CommandHandler * commandObj,
34183417
}
34193418
else
34203419
{
3421-
commandObj->AddStatus(commandPath, ToInteractionModelStatus(status));
3420+
commandObj->AddStatus(commandPath, status);
34223421
}
34233422
}
34243423

‎src/app/clusters/fan-control-server/fan-control-server.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include <app/ConcreteCommandPath.h>
3333
#include <app/clusters/fan-control-server/fan-control-server.h>
3434
#include <app/util/attribute-storage.h>
35-
#include <app/util/error-mapping.h>
3635
#include <lib/support/CodeUtils.h>
3736
#include <lib/support/logging/CHIPLogging.h>
3837

‎src/app/clusters/identify-server/identify-server.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
#include <app/util/af.h>
2929
#include <app/util/common.h>
30-
#include <app/util/error-mapping.h>
3130
#include <array>
3231
#include <lib/support/CodeUtils.h>
3332
#include <platform/CHIPDeviceLayer.h>
@@ -201,8 +200,7 @@ bool emberAfIdentifyClusterIdentifyCallback(CommandHandler * commandObj, const C
201200
auto & identifyTime = commandData.identifyTime;
202201

203202
// cmd Identify
204-
commandObj->AddStatus(commandPath,
205-
ToInteractionModelStatus(Attributes::IdentifyTime::Set(commandPath.mEndpointId, identifyTime)));
203+
commandObj->AddStatus(commandPath, Attributes::IdentifyTime::Set(commandPath.mEndpointId, identifyTime));
206204
return true;
207205
}
208206

‎src/app/clusters/laundry-dryer-controls-server/laundry-dryer-controls-server.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
#include <app/ConcreteAttributePath.h>
3333
#include <app/ConcreteCommandPath.h>
3434
#include <app/server/Server.h>
35-
#include <app/util/error-mapping.h>
3635
#include <lib/core/CHIPEncoding.h>
3736

3837
using namespace chip;

‎src/app/clusters/laundry-washer-controls-server/laundry-washer-controls-server.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include <app/ConcreteAttributePath.h>
3232
#include <app/ConcreteCommandPath.h>
3333
#include <app/server/Server.h>
34-
#include <app/util/error-mapping.h>
3534
#include <lib/core/CHIPEncoding.h>
3635

3736
using namespace chip;

‎src/app/clusters/level-control/level-control.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include <app/ConcreteCommandPath.h>
2626
#include <app/util/af.h>
2727
#include <app/util/config.h>
28-
#include <app/util/error-mapping.h>
2928
#include <app/util/util.h>
3029

3130
#include <app/reporting/reporting.h>
@@ -808,7 +807,7 @@ static Status moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8
808807
if (status != EMBER_ZCL_STATUS_SUCCESS)
809808
{
810809
ChipLogProgress(Zcl, "ERR: reading current level %x", status);
811-
return app::ToInteractionModelStatus(status);
810+
return status;
812811
}
813812

814813
if (currentLevel.IsNull())
@@ -873,7 +872,7 @@ static Status moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8
873872
if (status != EMBER_ZCL_STATUS_SUCCESS)
874873
{
875874
ChipLogProgress(Zcl, "ERR: reading on/off transition time %x", status);
876-
return app::ToInteractionModelStatus(status);
875+
return status;
877876
}
878877

879878
// Transition time comes in (or is stored, in the case of On/Off Transition
@@ -963,7 +962,7 @@ static void moveHandler(app::CommandHandler * commandObj, const app::ConcreteCom
963962
// Cancel any currently active command before fiddling with the state.
964963
cancelEndpointTimerCallback(endpoint);
965964

966-
status = app::ToInteractionModelStatus(Attributes::CurrentLevel::Get(endpoint, currentLevel));
965+
status = Attributes::CurrentLevel::Get(endpoint, currentLevel);
967966
if (status != Status::Success)
968967
{
969968
ChipLogProgress(Zcl, "ERR: reading current level %x", to_underlying(status));
@@ -1022,7 +1021,7 @@ static void moveHandler(app::CommandHandler * commandObj, const app::ConcreteCom
10221021
if (rate.IsNull())
10231022
{
10241023
app::DataModel::Nullable<uint8_t> defaultMoveRate;
1025-
status = app::ToInteractionModelStatus(Attributes::DefaultMoveRate::Get(endpoint, defaultMoveRate));
1024+
status = Attributes::DefaultMoveRate::Get(endpoint, defaultMoveRate);
10261025
if (status != Status::Success || defaultMoveRate.IsNull())
10271026
{
10281027
ChipLogProgress(Zcl, "ERR: reading default move rate %x", to_underlying(status));
@@ -1093,7 +1092,7 @@ static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCom
10931092
// Cancel any currently active command before fiddling with the state.
10941093
cancelEndpointTimerCallback(endpoint);
10951094

1096-
status = app::ToInteractionModelStatus(Attributes::CurrentLevel::Get(endpoint, currentLevel));
1095+
status = Attributes::CurrentLevel::Get(endpoint, currentLevel);
10971096
if (status != Status::Success)
10981097
{
10991098
ChipLogProgress(Zcl, "ERR: reading current level %x", to_underlying(status));

‎src/app/clusters/microwave-oven-control-server/microwave-oven-control-server.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <app/clusters/mode-base-server/mode-base-server.h>
2323
#include <app/reporting/reporting.h>
2424
#include <app/util/attribute-storage.h>
25-
#include <app/util/error-mapping.h>
2625

2726
using namespace chip;
2827
using namespace chip::app;

‎src/app/clusters/mode-select-server/mode-select-server.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include <app/util/af.h>
2828
#include <app/util/attribute-storage.h>
2929
#include <app/util/config.h>
30-
#include <app/util/error-mapping.h>
3130
#include <app/util/odd-sized-integers.h>
3231
#include <app/util/util.h>
3332
#include <lib/support/CodeUtils.h>

‎src/app/clusters/on-off-server/on-off-server.cpp

+4-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <app/reporting/reporting.h>
2323
#include <app/util/af.h>
2424
#include <app/util/config.h>
25-
#include <app/util/error-mapping.h>
2625
#include <app/util/util.h>
2726
#include <tracing/macros.h>
2827

@@ -573,7 +572,7 @@ bool OnOffServer::offCommand(app::CommandHandler * commandObj, const app::Concre
573572
MATTER_TRACE_SCOPE("OffCommand", "OnOff");
574573
EmberAfStatus status = setOnOffValue(commandPath.mEndpointId, Commands::Off::Id, false);
575574

576-
commandObj->AddStatus(commandPath, app::ToInteractionModelStatus(status));
575+
commandObj->AddStatus(commandPath, status);
577576
return true;
578577
}
579578

@@ -582,7 +581,7 @@ bool OnOffServer::onCommand(app::CommandHandler * commandObj, const app::Concret
582581
MATTER_TRACE_SCOPE("OnCommand", "OnOff");
583582
EmberAfStatus status = setOnOffValue(commandPath.mEndpointId, Commands::On::Id, false);
584583

585-
commandObj->AddStatus(commandPath, app::ToInteractionModelStatus(status));
584+
commandObj->AddStatus(commandPath, status);
586585
return true;
587586
}
588587

@@ -591,7 +590,7 @@ bool OnOffServer::toggleCommand(app::CommandHandler * commandObj, const app::Con
591590
MATTER_TRACE_SCOPE("ToggleCommand", "OnOff");
592591
EmberAfStatus status = setOnOffValue(commandPath.mEndpointId, Commands::Toggle::Id, false);
593592

594-
commandObj->AddStatus(commandPath, app::ToInteractionModelStatus(status));
593+
commandObj->AddStatus(commandPath, status);
595594
return true;
596595
}
597596

@@ -643,7 +642,7 @@ bool OnOffServer::offWithEffectCommand(app::CommandHandler * commandObj, const a
643642
}
644643
}
645644

646-
status = app::ToInteractionModelStatus(setOnOffValue(endpoint, Commands::Off::Id, false));
645+
status = setOnOffValue(endpoint, Commands::Off::Id, false);
647646
}
648647
else
649648
{

‎src/app/clusters/ota-provider/ota-provider.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <app/ConcreteCommandPath.h>
2323
#include <app/util/af.h>
2424
#include <app/util/config.h>
25-
#include <app/util/error-mapping.h>
2625
#include <platform/CHIPDeviceConfig.h>
2726
#include <protocols/interaction_model/Constants.h>
2827

‎src/app/clusters/refrigerator-alarm-server/refrigerator-alarm-server.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <app/EventLogging.h>
2424
#include <app/InteractionModelEngine.h>
2525
#include <app/util/attribute-storage.h>
26-
#include <app/util/error-mapping.h>
2726

2827
using namespace chip;
2928
using namespace chip::app;

‎src/app/clusters/scenes-server/scenes-server.cpp

+4-8
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include <app/reporting/reporting.h>
2626
#include <app/server/Server.h>
2727
#include <app/util/attribute-storage.h>
28-
#include <app/util/error-mapping.h>
2928
#include <credentials/GroupDataProvider.h>
3029
#include <lib/support/CommonIterator.h>
3130
#include <lib/support/Span.h>
@@ -84,7 +83,7 @@ CHIP_ERROR AddResponseOnError(CommandHandlerInterface::HandlerContext & ctx, Res
8483
template <typename ResponseType>
8584
CHIP_ERROR AddResponseOnError(CommandHandlerInterface::HandlerContext & ctx, ResponseType & resp, EmberAfStatus status)
8685
{
87-
return AddResponseOnError(ctx, resp, StatusIB(ToInteractionModelStatus(status)).ToChipError());
86+
return AddResponseOnError(ctx, resp, StatusIB(status).ToChipError());
8887
}
8988

9089
template <typename ResponseType>
@@ -536,8 +535,7 @@ CHIP_ERROR StoreSceneParse(const FabricIndex & fabricIdx, const EndpointId & end
536535
ScenesServer::Instance().MakeSceneInvalid(endpointID, fabricIdx);
537536

538537
uint16_t endpointTableSize = 0;
539-
ReturnErrorOnFailure(
540-
StatusIB(ToInteractionModelStatus(Attributes::SceneTableSize::Get(endpointID, &endpointTableSize))).ToChipError());
538+
ReturnErrorOnFailure(StatusIB(Attributes::SceneTableSize::Get(endpointID, &endpointTableSize)).ToChipError());
541539

542540
// Get Scene Table Instance
543541
SceneTable * sceneTable = scenes::GetSceneTableImpl(endpointID, endpointTableSize);
@@ -567,8 +565,7 @@ CHIP_ERROR StoreSceneParse(const FabricIndex & fabricIdx, const EndpointId & end
567565
else
568566
{
569567
uint32_t featureMap = 0;
570-
ReturnErrorOnFailure(
571-
StatusIB(ToInteractionModelStatus(Attributes::FeatureMap::Get(endpointID, &featureMap))).ToChipError());
568+
ReturnErrorOnFailure(StatusIB(Attributes::FeatureMap::Get(endpointID, &featureMap)).ToChipError());
572569
// Check if we still support scenes name in case an OTA changed that, if we don't, set name to empty
573570
if (!(featureMap & to_underlying(Feature::kSceneNames)))
574571
{
@@ -597,8 +594,7 @@ CHIP_ERROR RecallSceneParse(const FabricIndex & fabricIdx, const EndpointId & en
597594
ScenesServer::Instance().MakeSceneInvalidForAllFabrics(endpointID);
598595

599596
uint16_t endpointTableSize = 0;
600-
ReturnErrorOnFailure(
601-
StatusIB(ToInteractionModelStatus(Attributes::SceneTableSize::Get(endpointID, &endpointTableSize))).ToChipError());
597+
ReturnErrorOnFailure(StatusIB(Attributes::SceneTableSize::Get(endpointID, &endpointTableSize)).ToChipError());
602598

603599
// Get Scene Table Instance
604600
SceneTable * sceneTable = scenes::GetSceneTableImpl(endpointID, endpointTableSize);

‎src/app/clusters/temperature-control-server/temperature-control-server.cpp

+3-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <app/InteractionModelEngine.h>
2222
#include <app/clusters/temperature-control-server/supported-temperature-levels-manager.h>
2323
#include <app/util/attribute-storage.h>
24-
#include <app/util/error-mapping.h>
2524

2625
using namespace chip;
2726
using namespace chip::app;
@@ -134,14 +133,14 @@ bool emberAfTemperatureControlClusterSetTemperatureCallback(app::CommandHandler
134133
emberAfStatus = MinTemperature::Get(endpoint, &minTemperature);
135134
if (emberAfStatus != EMBER_ZCL_STATUS_SUCCESS)
136135
{
137-
status = app::ToInteractionModelStatus(emberAfStatus);
136+
status = emberAfStatus;
138137
goto exit;
139138
}
140139

141140
emberAfStatus = MaxTemperature::Get(endpoint, &maxTemperature);
142141
if (emberAfStatus != EMBER_ZCL_STATUS_SUCCESS)
143142
{
144-
status = app::ToInteractionModelStatus(emberAfStatus);
143+
status = emberAfStatus;
145144
goto exit;
146145
}
147146

@@ -156,7 +155,7 @@ bool emberAfTemperatureControlClusterSetTemperatureCallback(app::CommandHandler
156155
emberAfStatus = Step::Get(endpoint, &step);
157156
if (emberAfStatus != EMBER_ZCL_STATUS_SUCCESS)
158157
{
159-
status = app::ToInteractionModelStatus(emberAfStatus);
158+
status = emberAfStatus;
160159
goto exit;
161160
}
162161

‎src/app/clusters/thermostat-server/thermostat-server.cpp

+3-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <app/CommandHandler.h>
2727
#include <app/ConcreteAttributePath.h>
2828
#include <app/ConcreteCommandPath.h>
29-
#include <app/util/error-mapping.h>
3029
#include <lib/core/CHIPEncoding.h>
3130

3231
using namespace chip;
@@ -101,7 +100,7 @@ CHIP_ERROR ThermostatAttrAccess::Read(const ConcreteReadAttributePath & aPath, A
101100
EmberAfStatus status = RemoteSensing::Get(aPath.mEndpointId, &valueRemoteSensing);
102101
if (status != EMBER_ZCL_STATUS_SUCCESS)
103102
{
104-
StatusIB statusIB(ToInteractionModelStatus(status));
103+
StatusIB statusIB(status);
105104
return statusIB.ToChipError();
106105
}
107106
valueRemoteSensing.Clear(RemoteSensingBitmap::kLocalTemperature);
@@ -156,7 +155,7 @@ CHIP_ERROR ThermostatAttrAccess::Write(const ConcreteDataAttributePath & aPath,
156155
}
157156

158157
EmberAfStatus status = RemoteSensing::Set(aPath.mEndpointId, valueRemoteSensing);
159-
StatusIB statusIB(ToInteractionModelStatus(status));
158+
StatusIB statusIB(status);
160159
return statusIB.ToChipError();
161160
}
162161
break;
@@ -925,7 +924,7 @@ bool emberAfThermostatClusterSetpointRaiseLowerCallback(app::CommandHandler * co
925924
break;
926925
}
927926

928-
commandObj->AddStatus(commandPath, app::ToInteractionModelStatus(status));
927+
commandObj->AddStatus(commandPath, status);
929928
return true;
930929
}
931930

‎src/app/clusters/window-covering-server/window-covering-server.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <app/util/af.h>
2727
#include <app/util/attribute-storage.h>
2828
#include <app/util/config.h>
29-
#include <app/util/error-mapping.h>
3029
#include <lib/support/TypeTraits.h>
3130
#include <string.h>
3231

0 commit comments

Comments
 (0)