|
25 | 25 | #include <app/ConcreteCommandPath.h>
|
26 | 26 | #include <app/util/af.h>
|
27 | 27 | #include <app/util/config.h>
|
28 |
| -#include <app/util/error-mapping.h> |
29 | 28 | #include <app/util/util.h>
|
30 | 29 |
|
31 | 30 | #include <app/reporting/reporting.h>
|
@@ -808,7 +807,7 @@ static Status moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8
|
808 | 807 | if (status != EMBER_ZCL_STATUS_SUCCESS)
|
809 | 808 | {
|
810 | 809 | ChipLogProgress(Zcl, "ERR: reading current level %x", status);
|
811 |
| - return app::ToInteractionModelStatus(status); |
| 810 | + return status; |
812 | 811 | }
|
813 | 812 |
|
814 | 813 | if (currentLevel.IsNull())
|
@@ -873,7 +872,7 @@ static Status moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8
|
873 | 872 | if (status != EMBER_ZCL_STATUS_SUCCESS)
|
874 | 873 | {
|
875 | 874 | ChipLogProgress(Zcl, "ERR: reading on/off transition time %x", status);
|
876 |
| - return app::ToInteractionModelStatus(status); |
| 875 | + return status; |
877 | 876 | }
|
878 | 877 |
|
879 | 878 | // 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
|
963 | 962 | // Cancel any currently active command before fiddling with the state.
|
964 | 963 | cancelEndpointTimerCallback(endpoint);
|
965 | 964 |
|
966 |
| - status = app::ToInteractionModelStatus(Attributes::CurrentLevel::Get(endpoint, currentLevel)); |
| 965 | + status = Attributes::CurrentLevel::Get(endpoint, currentLevel); |
967 | 966 | if (status != Status::Success)
|
968 | 967 | {
|
969 | 968 | ChipLogProgress(Zcl, "ERR: reading current level %x", to_underlying(status));
|
@@ -1022,7 +1021,7 @@ static void moveHandler(app::CommandHandler * commandObj, const app::ConcreteCom
|
1022 | 1021 | if (rate.IsNull())
|
1023 | 1022 | {
|
1024 | 1023 | app::DataModel::Nullable<uint8_t> defaultMoveRate;
|
1025 |
| - status = app::ToInteractionModelStatus(Attributes::DefaultMoveRate::Get(endpoint, defaultMoveRate)); |
| 1024 | + status = Attributes::DefaultMoveRate::Get(endpoint, defaultMoveRate); |
1026 | 1025 | if (status != Status::Success || defaultMoveRate.IsNull())
|
1027 | 1026 | {
|
1028 | 1027 | ChipLogProgress(Zcl, "ERR: reading default move rate %x", to_underlying(status));
|
@@ -1093,7 +1092,7 @@ static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCom
|
1093 | 1092 | // Cancel any currently active command before fiddling with the state.
|
1094 | 1093 | cancelEndpointTimerCallback(endpoint);
|
1095 | 1094 |
|
1096 |
| - status = app::ToInteractionModelStatus(Attributes::CurrentLevel::Get(endpoint, currentLevel)); |
| 1095 | + status = Attributes::CurrentLevel::Get(endpoint, currentLevel); |
1097 | 1096 | if (status != Status::Success)
|
1098 | 1097 | {
|
1099 | 1098 | ChipLogProgress(Zcl, "ERR: reading current level %x", to_underlying(status));
|
|
0 commit comments