diff --git a/examples/chip-tool/templates/partials/test_cluster.zapt b/examples/chip-tool/templates/partials/test_cluster.zapt index 498f8e4a115063..8581f50eca6bba 100644 --- a/examples/chip-tool/templates/partials/test_cluster.zapt +++ b/examples/chip-tool/templates/partials/test_cluster.zapt @@ -60,77 +60,69 @@ class {{filename}}: public TestCommand {{/chip_tests_item_response_parameters}} {{/chip_tests_items}} - {{#*inline "failureCallback"}}mOnFailureCallback_{{index}}{{/inline}} - {{#*inline "successCallback"}}mOnSuccessCallback_{{index}}{{/inline}} - - {{#if isGroupCommand}} - {{#*inline "doneCallback"}}mOnDoneCallback_{{index}}{{/inline}} + {{~#*inline "subscribeDataCallback"}} + mTest_{{parent.filename}}_{{attribute}}_Reported + {{/inline}} + {{#*inline "subscribeDataCallbackType"}} + Test_{{parent.filename}}_{{attribute}}_ReportCallback + {{/inline}} + {{#chip_tests_items}} + {{#if allocateSubscribeDataCallback}} + typedef void (*{{> subscribeDataCallbackType}})(void * context, {{zapTypeToDecodableClusterObjectType attributeObject.type ns=parent.cluster isArgument=true}} value); + {{> subscribeDataCallbackType}} {{> subscribeDataCallback}} = nullptr; {{/if}} + {{/chip_tests_items}} - {{#*inline "failureResponse"}}OnFailureCallback_{{index}}{{/inline}} - {{#*inline "successResponse"}}OnSuccessCallback_{{index}}{{/inline}} - - {{#*inline "doneResponse"}}OnDoneCallback_{{index}}{{/inline}} + {{#*inline "failureResponse"}}OnFailureResponse_{{index}}{{/inline}} + {{#*inline "successResponse"}}OnSuccessResponse_{{index}}{{/inline}} + {{#*inline "subscriptionEstablished"}}OnSubscriptionEstablishedResponse_{{index}}{{/inline}} + {{#*inline "doneResponse"}}OnDoneResponse_{{index}}{{/inline}} - {{#*inline "successArguments"}}void * context{{#chip_tests_item_response_parameters}}, {{zapTypeToDecodableClusterObjectType type ns=parent.cluster isArgument=true}} {{asLowerCamelCase name}}{{/chip_tests_item_response_parameters}}{{/inline}} - {{#*inline "failureArguments"}}void * context, uint8_t status{{/inline}} + {{#*inline "staticFailureResponse"}}OnFailureCallback_{{index}}{{/inline}} + {{#*inline "staticSuccessResponse"}}OnSuccessCallback_{{index}}{{/inline}} + {{#*inline "staticSubscriptionEstablished"}}OnSubscriptionEstablished_{{index}}{{/inline}} + {{#*inline "staticDoneResponse"}}OnDoneCallback_{{index}}{{/inline}} - {{#if isGroupCommand}} - {{#*inline "doneArguments"}}void * context{{/inline}} - {{/if}} + {{#*inline "successArguments"}}{{#chip_tests_item_response_parameters}}{{#first}}{{#if ../leadingComma}}, {{/if}}{{/first}} {{zapTypeToDecodableClusterObjectType type ns=parent.cluster isArgument=true}} {{asLowerCamelCase name}}{{#not_last}}, {{/not_last}}{{/chip_tests_item_response_parameters}}{{/inline}} + {{#*inline "failureArguments"}}{{#if leadingComma}}, {{/if}}EmberAfStatus status{{/inline}} + {{#*inline "staticSuccessArguments"}}void * context{{> successArguments leadingComma=true}}{{/inline}} + {{#*inline "staticFailureArguments"}}void * context{{> failureArguments leadingComma=true}}{{/inline}} + {{#*inline "staticDoneArguments"}}void * context{{/inline}} + {{#*inline "doneArguments"}}{{/inline}} - {{#chip_tests_items}} - {{#unless (isTestOnlyCluster cluster)}} - {{#unless isWait}} - {{#unless isCommand}} - {{#unless isWriteAttribute}} - {{#unless isReadAttribute}} - chip::Callback::CallbackfailureArguments}})> {{>failureCallback}} { {{>failureResponse}}, this }; - chip::Callback::CallbacksuccessArguments}})> {{>successCallback}} { {{>successResponse}}, this }; - {{/unless}} - {{/unless}} - {{/unless}} - {{/unless}} - {{/unless}} - {{/chip_tests_items}} + {{#*inline "staticSubscriptionEstablishedArguments"}}void * context{{/inline}} + {{#*inline "subscriptionEstablishedArguments"}}{{/inline}} {{#chip_tests_items}} {{#unless (isTestOnlyCluster cluster)}} {{#unless isWait}} {{#unless isCommand}} {{#if isWriteAttribute}} - static void {{>failureResponse}}(void * context, EmberAfStatus status) - { - (static_cast<{{filename}} *>(context))->OnFailureResponse_{{index}}(chip::to_underlying(status)); - } - - {{#if isGroupCommand}} - static void {{>doneResponse}}(void * context) - { - (static_cast<{{filename}} *>(context))->OnDoneResponse_{{index}}(); - - } + {{#if isGroupCommand}} + static void {{>staticDoneResponse}}({{>staticDoneArguments}}) + { + (static_cast<{{filename}} *>(context))->{{> doneResponse }}(); + } + {{/if}} {{/if}} - {{else if isReadAttribute}} - static void {{>failureResponse}}(void * context, EmberAfStatus status) + static void {{>staticFailureResponse}}({{>staticFailureArguments}}) { - (static_cast<{{filename}} *>(context))->OnFailureResponse_{{index}}(chip::to_underlying(status)); + (static_cast<{{filename}} *>(context))->{{>failureResponse}}(status); } - {{else}} - static void {{>failureResponse}}({{> failureArguments}}) + + static void {{>staticSuccessResponse}}({{> staticSuccessArguments}}) { - (static_cast<{{filename}} *>(context))->OnFailureResponse_{{index}}(status); + (static_cast<{{filename}} *>(context))->{{>successResponse}}({{#chip_tests_item_response_parameters}}{{#not_first}}, {{/not_first}}{{asLowerCamelCase name}}{{/chip_tests_item_response_parameters}}); } - {{/if}} - - static void {{>successResponse}}({{> successArguments}}) + {{#if isSubscribeAttribute}} + static void {{> staticSubscriptionEstablished}}({{> staticSubscriptionEstablishedArguments}}) { - (static_cast<{{filename}} *>(context))->OnSuccessResponse_{{index}}({{#chip_tests_item_response_parameters}}{{#not_first}}, {{/not_first}}{{asLowerCamelCase name}}{{/chip_tests_item_response_parameters}}); + (static_cast<{{filename}} *>(context))->{{> subscriptionEstablished}}(); } + {{/if}} - {{! "isWaitForReport" can be replaced by "async" if there is a mechanism to remove the report handler}} {{#if isWaitForReport}} bool mReceivedReport_{{index}} = false; {{/if}} @@ -164,13 +156,6 @@ class {{filename}}: public TestCommand return CHIP_NO_ERROR; } {{else}} - {{#*inline "failureResponse"}}OnFailureResponse_{{index}}{{/inline}} - {{#*inline "successResponse"}}OnSuccessResponse_{{index}}{{/inline}} - {{#*inline "doneResponse"}}OnDoneResponse_{{index}}{{/inline}} - - {{#*inline "failureArguments"}}uint8_t status{{/inline}} - {{#*inline "successArguments"}}{{#chip_tests_item_response_parameters}}{{#not_first}}, {{/not_first}}{{zapTypeToDecodableClusterObjectType type ns=parent.cluster isArgument=true}} {{asLowerCamelCase name}}{{/chip_tests_item_response_parameters}}{{/inline}} - {{#*inline "doneArguments"}}{{/inline}} {{#*inline "device"}}mDevices[kIdentity{{asUpperCamelCase identity}}]{{/inline}} CHIP_ERROR {{>testCommand}}() @@ -212,11 +197,11 @@ class {{filename}}: public TestCommand {{/chip_tests_item_parameters}} auto success = [](void * context, const typename RequestType::ResponseType & data) { - (static_cast<{{filename}} *>(context))->OnSuccessResponse_{{index}}({{#chip_tests_item_response_parameters}}{{#not_first}}, {{/not_first}}data.{{asLowerCamelCase name}}{{/chip_tests_item_response_parameters}}); + (static_cast<{{filename}} *>(context))->{{>successResponse}}({{#chip_tests_item_response_parameters}}{{#not_first}}, {{/not_first}}data.{{asLowerCamelCase name}}{{/chip_tests_item_response_parameters}}); }; auto failure = [](void * context, EmberAfStatus status) { - (static_cast<{{filename}} *>(context))->OnFailureResponse_{{index}}(status); + (static_cast<{{filename}} *>(context))->{{>failureResponse}}(status); }; ReturnErrorOnFailure(chip::Controller::{{#if isGroupCommand}}InvokeGroupCommand{{else}}InvokeCommand{{/if}}({{>device}}, this, success, failure, @@ -225,7 +210,6 @@ class {{filename}}: public TestCommand {{> maybeTimedInteractionTimeout }} )); {{> maybeWait }} - {{#unless async}}return CHIP_NO_ERROR;{{/unless}} {{else}} chip::Controller::{{asUpperCamelCase cluster}}ClusterTest cluster; {{#if isGroupCommand}} @@ -240,26 +224,26 @@ class {{filename}}: public TestCommand {{/chip_tests_item_parameters}} {{#if isWriteAttribute}} - {{#*inline "failureResponse"}}OnFailureCallback_{{index}}{{/inline}} - {{#*inline "successResponse"}}OnSuccessCallback_{{index}}{{/inline}} - {{#*inline "doneResponse"}}OnDoneCallback_{{index}}{{/inline}} - ReturnErrorOnFailure(cluster.WriteAttribute({{#chip_tests_item_parameters}}{{asLowerCamelCase name}}Argument, {{/chip_tests_item_parameters}}this, {{>successResponse}}, {{>failureResponse}} + ReturnErrorOnFailure(cluster.WriteAttribute({{#chip_tests_item_parameters}}{{asLowerCamelCase name}}Argument, {{/chip_tests_item_parameters}}this, {{>staticSuccessResponse}}, {{>staticFailureResponse}} {{~> maybeTimedInteractionTimeout ~}} - {{~#if isGroupCommand}}, {{>doneResponse}}{{/if~}} + {{~#if isGroupCommand}}, {{>staticDoneResponse}}{{/if~}} )); {{> maybeWait }} - {{#unless async}}return CHIP_NO_ERROR;{{/unless}} {{else if isReadAttribute}} - {{#*inline "failureResponse"}}OnFailureCallback_{{index}}{{/inline}} - {{#*inline "successResponse"}}OnSuccessCallback_{{index}}{{/inline}} - {{#if async}}ReturnErrorOnFailure({{else}}return {{/if}}cluster.ReadAttribute({{#chip_tests_item_parameters}}{{asLowerCamelCase name}}Argument, {{/chip_tests_item_parameters}}this, {{>successResponse}}, {{>failureResponse}}){{#if async}}){{/if}}; + ReturnErrorOnFailure(cluster.ReadAttribute({{#chip_tests_item_parameters}}{{asLowerCamelCase name}}Argument, {{/chip_tests_item_parameters}}this, {{>staticSuccessResponse}}, {{>staticFailureResponse}})); + {{else if isSubscribeAttribute}} + ReturnErrorOnFailure(cluster.SubscribeAttribute(this, {{>staticSuccessResponse}}, {{>staticFailureResponse}}, minIntervalArgument, maxIntervalArgument, {{>staticSubscriptionEstablished}})); + {{else if isWaitForReport}} + {{> subscribeDataCallback}} = {{> staticSuccessResponse}}; {{else}} - {{~#*inline "commandName"}}{{asUpperCamelCase commandName}}{{#if isAttribute}}Attribute{{asUpperCamelCase attribute}}{{/if}}{{/inline}} - {{#if async}}ReturnErrorOnFailure({{else}}return {{/if}}cluster.{{>commandName}}({{>successCallback}}.Cancel(){{#unless isWaitForReport}}, {{>failureCallback}}.Cancel(){{/unless}}{{#chip_tests_item_parameters}}, {{asLowerCamelCase name}}Argument{{/chip_tests_item_parameters}}){{#if async}}){{/if}}; + UNEXPECTED COMMAND: {{>commandName}} {{/if}} - {{/if}} - {{#if async}}return WaitForMs(0);{{/if}} + {{#if async}} + return WaitForMs(0); + {{else}} + return CHIP_NO_ERROR; + {{/if}} } void {{>failureResponse}}({{>failureArguments}}) @@ -275,6 +259,30 @@ class {{filename}}: public TestCommand {{/if}} } + {{#if isSubscribeAttribute}} + void {{>successResponse}}({{zapTypeToDecodableClusterObjectType attributeObject.type ns=parent.cluster isArgument=true}} value) + { + {{#if response.error}} + ThrowSuccessResponse(); + {{else if response.errorWrongValue}} + ThrowSuccessResponse(); + {{else}} + if ({{> subscribeDataCallback}}) { + auto callback = {{> subscribeDataCallback}}; + {{> subscribeDataCallback}} = nullptr; + callback(this, value); + } + {{/if}} + } + + void {{>subscriptionEstablished}}({{> subscriptionEstablishedArguments}}) + { + {{#if hasWaitForReport}} + VerifyOrReturn(mReceivedReport_{{waitForReport.index}}, Exit("Initial report not received!")); + {{/if}} + {{#unless async}}NextTest();{{/unless}} + } + {{else}} void {{>successResponse}}({{>successArguments}}) { {{~#if response.error}} @@ -282,14 +290,9 @@ class {{filename}}: public TestCommand {{else if response.errorWrongValue}} ThrowSuccessResponse(); {{else}} - {{! This block can be removed if there is a mechanism to remove the report handler}} {{#if isWaitForReport}} - VerifyOrReturn(mReceivedReport_{{index}} == false, ChipLogError(chipTool, "Not Fatal: on report called more than once.")); mReceivedReport_{{index}} = true; {{/if}} - {{#if hasWaitForReport}} - VerifyOrReturn(mReceivedReport_{{waitForReport.index}}, Exit("Initial report not received!")); - {{/if}} {{#chip_tests_item_response_parameters}} {{~#*inline "item"}}{{asLowerCamelCase name}}{{#if isOptional}}.Value(){{/if}}{{/inline}} {{#if hasExpectedValue}} @@ -318,6 +321,7 @@ class {{filename}}: public TestCommand {{#unless async}}NextTest();{{/unless}} {{/if}} } + {{/if}} {{#if isGroupCommand}} void {{>doneResponse}}({{>doneArguments}}) diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 2e7ae41c028002..14632bbe5ac663 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -219,7 +219,7 @@ class Test_TC_BI_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t clusterRevision) @@ -229,7 +229,7 @@ class Test_TC_BI_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint16_t clusterRevision) @@ -239,14 +239,14 @@ class Test_TC_BI_1_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context) { (static_cast(context))->OnSuccessResponse_3(); } static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint16_t clusterRevision) @@ -270,11 +270,12 @@ class Test_TC_BI_1_1 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t clusterRevision) { @@ -289,11 +290,12 @@ class Test_TC_BI_1_1 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint16_t clusterRevision) { @@ -316,7 +318,7 @@ class Test_TC_BI_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) + void OnFailureResponse_3(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -330,11 +332,12 @@ class Test_TC_BI_1_1 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint16_t clusterRevision) { @@ -440,7 +443,7 @@ class Test_TC_BI_2_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, bool outOfService) @@ -450,7 +453,7 @@ class Test_TC_BI_2_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool outOfService) @@ -460,14 +463,14 @@ class Test_TC_BI_2_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context) { (static_cast(context))->OnSuccessResponse_3(); } static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, bool outOfService) @@ -477,7 +480,7 @@ class Test_TC_BI_2_1 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, bool presentValue) @@ -487,14 +490,14 @@ class Test_TC_BI_2_1 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context) { (static_cast(context))->OnSuccessResponse_6(); } static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, bool presentValue) @@ -504,7 +507,7 @@ class Test_TC_BI_2_1 : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context, uint8_t statusFlags) @@ -514,7 +517,7 @@ class Test_TC_BI_2_1 : public TestCommand static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context, uint8_t statusFlags) @@ -524,14 +527,14 @@ class Test_TC_BI_2_1 : public TestCommand static void OnFailureCallback_10(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_10(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_10(status); } static void OnSuccessCallback_10(void * context) { (static_cast(context))->OnSuccessResponse_10(); } static void OnFailureCallback_11(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_11(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_11(status); } static void OnSuccessCallback_11(void * context, uint8_t statusFlags) @@ -555,11 +558,12 @@ class Test_TC_BI_2_1 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(bool outOfService) { @@ -574,11 +578,12 @@ class Test_TC_BI_2_1 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool outOfService) { @@ -601,7 +606,7 @@ class Test_TC_BI_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -611,11 +616,12 @@ class Test_TC_BI_2_1 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(bool outOfService) { @@ -630,11 +636,12 @@ class Test_TC_BI_2_1 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_5, OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(bool presentValue) { @@ -657,7 +664,7 @@ class Test_TC_BI_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6() { NextTest(); } @@ -667,11 +674,12 @@ class Test_TC_BI_2_1 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_7, OnFailureCallback_7); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(bool presentValue) { @@ -686,11 +694,12 @@ class Test_TC_BI_2_1 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_8, OnFailureCallback_8); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_8, OnFailureCallback_8)); + return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(uint8_t statusFlags) { @@ -705,11 +714,12 @@ class Test_TC_BI_2_1 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_9, OnFailureCallback_9); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_9, OnFailureCallback_9)); + return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9(uint8_t statusFlags) { @@ -733,7 +743,7 @@ class Test_TC_BI_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) + void OnFailureResponse_10(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -747,11 +757,12 @@ class Test_TC_BI_2_1 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_11, OnFailureCallback_11); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_11, OnFailureCallback_11)); + return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11(uint8_t statusFlags) { @@ -842,7 +853,7 @@ class Test_TC_BI_2_2 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, bool presentValue) @@ -852,7 +863,7 @@ class Test_TC_BI_2_2 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool outOfService) @@ -862,7 +873,7 @@ class Test_TC_BI_2_2 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint8_t statusFlags) @@ -872,7 +883,7 @@ class Test_TC_BI_2_2 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, bool presentValue) @@ -882,7 +893,7 @@ class Test_TC_BI_2_2 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, bool outOfService) @@ -892,7 +903,7 @@ class Test_TC_BI_2_2 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, uint8_t statusFlags) @@ -902,7 +913,7 @@ class Test_TC_BI_2_2 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, uint8_t statusFlags) @@ -912,7 +923,7 @@ class Test_TC_BI_2_2 : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context, uint8_t statusFlags) @@ -936,11 +947,12 @@ class Test_TC_BI_2_2 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(bool presentValue) { @@ -955,11 +967,12 @@ class Test_TC_BI_2_2 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool outOfService) { @@ -974,11 +987,12 @@ class Test_TC_BI_2_2 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint8_t statusFlags) { @@ -993,11 +1007,12 @@ class Test_TC_BI_2_2 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(bool presentValue) { @@ -1012,11 +1027,12 @@ class Test_TC_BI_2_2 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_5, OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(bool outOfService) { @@ -1031,11 +1047,12 @@ class Test_TC_BI_2_2 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_6, OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(uint8_t statusFlags) { @@ -1050,11 +1067,12 @@ class Test_TC_BI_2_2 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_7, OnFailureCallback_7); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(uint8_t statusFlags) { @@ -1069,11 +1087,12 @@ class Test_TC_BI_2_2 : public TestCommand chip::Controller::BinaryInputBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_8, OnFailureCallback_8); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_8, OnFailureCallback_8)); + return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(uint8_t statusFlags) { @@ -1149,7 +1168,7 @@ class Test_TC_BOOL_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t clusterRevision) @@ -1159,7 +1178,7 @@ class Test_TC_BOOL_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint16_t clusterRevision) @@ -1169,14 +1188,14 @@ class Test_TC_BOOL_1_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context) { (static_cast(context))->OnSuccessResponse_3(); } static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint16_t clusterRevision) @@ -1200,11 +1219,12 @@ class Test_TC_BOOL_1_1 : public TestCommand chip::Controller::BooleanStateClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t clusterRevision) { @@ -1219,11 +1239,12 @@ class Test_TC_BOOL_1_1 : public TestCommand chip::Controller::BooleanStateClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint16_t clusterRevision) { @@ -1246,7 +1267,7 @@ class Test_TC_BOOL_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) + void OnFailureResponse_3(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -1260,11 +1281,12 @@ class Test_TC_BOOL_1_1 : public TestCommand chip::Controller::BooleanStateClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint16_t clusterRevision) { @@ -1340,7 +1362,7 @@ class Test_TC_BOOL_2_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, bool stateValue) @@ -1350,7 +1372,7 @@ class Test_TC_BOOL_2_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool stateValue) @@ -1360,14 +1382,14 @@ class Test_TC_BOOL_2_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context) { (static_cast(context))->OnSuccessResponse_3(); } static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, bool stateValue) @@ -1391,11 +1413,12 @@ class Test_TC_BOOL_2_1 : public TestCommand chip::Controller::BooleanStateClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_1, - OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(bool stateValue) { @@ -1410,11 +1433,12 @@ class Test_TC_BOOL_2_1 : public TestCommand chip::Controller::BooleanStateClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool stateValue) { @@ -1437,7 +1461,7 @@ class Test_TC_BOOL_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) + void OnFailureResponse_3(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -1451,11 +1475,12 @@ class Test_TC_BOOL_2_1 : public TestCommand chip::Controller::BooleanStateClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_4, - OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(bool stateValue) { @@ -1523,7 +1548,7 @@ class Test_TC_CC_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t clusterRevision) @@ -1533,7 +1558,7 @@ class Test_TC_CC_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context) { (static_cast(context))->OnSuccessResponse_2(); } @@ -1554,11 +1579,12 @@ class Test_TC_CC_1_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t clusterRevision) { @@ -1581,7 +1607,7 @@ class Test_TC_CC_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) + void OnFailureResponse_2(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -2228,7 +2254,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint8_t currentHue) @@ -2238,7 +2264,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint8_t currentHue) @@ -2248,14 +2274,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context) { (static_cast(context))->OnSuccessResponse_3(); } static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint8_t currentHue) @@ -2265,7 +2291,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, uint8_t currentSaturation) @@ -2275,7 +2301,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, uint8_t currentSaturation) @@ -2285,14 +2311,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context) { (static_cast(context))->OnSuccessResponse_7(); } static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context, uint8_t currentSaturation) @@ -2302,7 +2328,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context, uint16_t currentX) @@ -2312,7 +2338,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_10(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_10(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_10(status); } static void OnSuccessCallback_10(void * context, uint16_t currentX) @@ -2322,14 +2348,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_11(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_11(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_11(status); } static void OnSuccessCallback_11(void * context) { (static_cast(context))->OnSuccessResponse_11(); } static void OnFailureCallback_12(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_12(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_12(status); } static void OnSuccessCallback_12(void * context, uint16_t currentX) @@ -2339,7 +2365,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_13(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_13(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_13(status); } static void OnSuccessCallback_13(void * context, uint16_t currentY) @@ -2349,7 +2375,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_14(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_14(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_14(status); } static void OnSuccessCallback_14(void * context, uint16_t currentY) @@ -2359,14 +2385,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_15(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_15(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_15(status); } static void OnSuccessCallback_15(void * context) { (static_cast(context))->OnSuccessResponse_15(); } static void OnFailureCallback_16(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_16(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_16(status); } static void OnSuccessCallback_16(void * context, uint16_t currentY) @@ -2376,7 +2402,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_17(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_17(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_17(status); } static void OnSuccessCallback_17(void * context, uint16_t colorTemperature) @@ -2386,7 +2412,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_18(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_18(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_18(status); } static void OnSuccessCallback_18(void * context, uint8_t colorMode) @@ -2396,7 +2422,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_19(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_19(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_19(status); } static void OnSuccessCallback_19(void * context, uint8_t colorControlOptions) @@ -2406,7 +2432,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_20(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_20(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_20(status); } static void OnSuccessCallback_20(void * context, uint8_t colorControlOptions) @@ -2416,14 +2442,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_21(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_21(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_21(status); } static void OnSuccessCallback_21(void * context) { (static_cast(context))->OnSuccessResponse_21(); } static void OnFailureCallback_22(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_22(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_22(status); } static void OnSuccessCallback_22(void * context, uint8_t colorControlOptions) @@ -2433,7 +2459,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_23(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_23(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_23(status); } static void OnSuccessCallback_23(void * context, uint16_t enhancedCurrentHue) @@ -2443,7 +2469,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_24(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_24(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_24(status); } static void OnSuccessCallback_24(void * context, uint16_t enhancedCurrentHue) @@ -2453,14 +2479,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_25(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_25(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_25(status); } static void OnSuccessCallback_25(void * context) { (static_cast(context))->OnSuccessResponse_25(); } static void OnFailureCallback_26(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_26(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_26(status); } static void OnSuccessCallback_26(void * context, uint16_t enhancedCurrentHue) @@ -2470,7 +2496,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_27(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_27(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_27(status); } static void OnSuccessCallback_27(void * context, uint8_t enhancedColorMode) @@ -2480,7 +2506,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_28(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_28(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_28(status); } static void OnSuccessCallback_28(void * context, uint8_t colorLoopActive) @@ -2490,7 +2516,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_29(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_29(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_29(status); } static void OnSuccessCallback_29(void * context, uint8_t colorLoopActive) @@ -2500,14 +2526,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_30(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_30(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_30(status); } static void OnSuccessCallback_30(void * context) { (static_cast(context))->OnSuccessResponse_30(); } static void OnFailureCallback_31(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_31(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_31(status); } static void OnSuccessCallback_31(void * context, uint8_t colorLoopActive) @@ -2517,7 +2543,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_32(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_32(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_32(status); } static void OnSuccessCallback_32(void * context, uint8_t colorLoopDirection) @@ -2527,7 +2553,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_33(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_33(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_33(status); } static void OnSuccessCallback_33(void * context, uint8_t colorLoopDirection) @@ -2537,14 +2563,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_34(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_34(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_34(status); } static void OnSuccessCallback_34(void * context) { (static_cast(context))->OnSuccessResponse_34(); } static void OnFailureCallback_35(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_35(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_35(status); } static void OnSuccessCallback_35(void * context, uint8_t colorLoopDirection) @@ -2554,7 +2580,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_36(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_36(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_36(status); } static void OnSuccessCallback_36(void * context, uint16_t colorLoopTime) @@ -2564,7 +2590,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_37(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_37(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_37(status); } static void OnSuccessCallback_37(void * context, uint16_t colorLoopTime) @@ -2574,14 +2600,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_38(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_38(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_38(status); } static void OnSuccessCallback_38(void * context) { (static_cast(context))->OnSuccessResponse_38(); } static void OnFailureCallback_39(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_39(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_39(status); } static void OnSuccessCallback_39(void * context, uint16_t colorLoopTime) @@ -2591,7 +2617,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_40(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_40(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_40(status); } static void OnSuccessCallback_40(void * context, uint16_t colorLoopStartEnhancedHue) @@ -2601,7 +2627,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_41(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_41(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_41(status); } static void OnSuccessCallback_41(void * context, uint16_t colorLoopStartEnhancedHue) @@ -2611,14 +2637,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_42(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_42(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_42(status); } static void OnSuccessCallback_42(void * context) { (static_cast(context))->OnSuccessResponse_42(); } static void OnFailureCallback_43(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_43(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_43(status); } static void OnSuccessCallback_43(void * context, uint16_t colorLoopStartEnhancedHue) @@ -2628,7 +2654,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_44(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_44(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_44(status); } static void OnSuccessCallback_44(void * context, uint16_t colorLoopStoredEnhancedHue) @@ -2638,7 +2664,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_45(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_45(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_45(status); } static void OnSuccessCallback_45(void * context, uint16_t colorLoopStoredEnhancedHue) @@ -2648,14 +2674,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_46(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_46(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_46(status); } static void OnSuccessCallback_46(void * context) { (static_cast(context))->OnSuccessResponse_46(); } static void OnFailureCallback_47(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_47(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_47(status); } static void OnSuccessCallback_47(void * context, uint16_t colorLoopStoredEnhancedHue) @@ -2665,7 +2691,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_48(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_48(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_48(status); } static void OnSuccessCallback_48(void * context, uint16_t colorCapabilities) @@ -2675,7 +2701,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_49(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_49(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_49(status); } static void OnSuccessCallback_49(void * context, uint16_t colorCapabilities) @@ -2685,14 +2711,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_50(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_50(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_50(status); } static void OnSuccessCallback_50(void * context) { (static_cast(context))->OnSuccessResponse_50(); } static void OnFailureCallback_51(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_51(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_51(status); } static void OnSuccessCallback_51(void * context, uint16_t colorCapabilities) @@ -2702,7 +2728,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_52(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_52(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_52(status); } static void OnSuccessCallback_52(void * context, uint16_t colorTempPhysicalMin) @@ -2712,7 +2738,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_53(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_53(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_53(status); } static void OnSuccessCallback_53(void * context, uint16_t colorTempPhysicalMin) @@ -2722,14 +2748,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_54(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_54(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_54(status); } static void OnSuccessCallback_54(void * context) { (static_cast(context))->OnSuccessResponse_54(); } static void OnFailureCallback_55(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_55(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_55(status); } static void OnSuccessCallback_55(void * context, uint16_t colorTempPhysicalMin) @@ -2739,7 +2765,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_56(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_56(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_56(status); } static void OnSuccessCallback_56(void * context, uint16_t colorTempPhysicalMax) @@ -2749,7 +2775,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_57(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_57(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_57(status); } static void OnSuccessCallback_57(void * context, uint16_t colorTempPhysicalMax) @@ -2759,14 +2785,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_58(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_58(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_58(status); } static void OnSuccessCallback_58(void * context) { (static_cast(context))->OnSuccessResponse_58(); } static void OnFailureCallback_59(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_59(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_59(status); } static void OnSuccessCallback_59(void * context, uint16_t colorTempPhysicalMax) @@ -2776,7 +2802,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_60(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_60(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_60(status); } static void OnSuccessCallback_60(void * context, uint16_t coupleColorTempToLevelMinMireds) @@ -2786,14 +2812,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_61(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_61(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_61(status); } static void OnSuccessCallback_61(void * context) { (static_cast(context))->OnSuccessResponse_61(); } static void OnFailureCallback_62(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_62(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_62(status); } static void OnSuccessCallback_62(void * context, uint16_t coupleColorTempToLevelMinMireds) @@ -2803,7 +2829,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_63(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_63(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_63(status); } static void OnSuccessCallback_63(void * context, uint16_t startUpColorTemperatureMireds) @@ -2813,14 +2839,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_64(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_64(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_64(status); } static void OnSuccessCallback_64(void * context) { (static_cast(context))->OnSuccessResponse_64(); } static void OnFailureCallback_65(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_65(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_65(status); } static void OnSuccessCallback_65(void * context, uint16_t startUpColorTemperatureMireds) @@ -2830,7 +2856,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_66(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_66(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_66(status); } static void OnSuccessCallback_66(void * context, uint16_t remainingTime) @@ -2840,7 +2866,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_67(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_67(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_67(status); } static void OnSuccessCallback_67(void * context, uint16_t remainingTime) @@ -2850,14 +2876,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_68(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_68(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_68(status); } static void OnSuccessCallback_68(void * context) { (static_cast(context))->OnSuccessResponse_68(); } static void OnFailureCallback_69(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_69(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_69(status); } static void OnSuccessCallback_69(void * context, uint16_t remainingTime) @@ -2867,7 +2893,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_70(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_70(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_70(status); } static void OnSuccessCallback_70(void * context, uint8_t driftCompensation) @@ -2877,14 +2903,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_71(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_71(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_71(status); } static void OnSuccessCallback_71(void * context) { (static_cast(context))->OnSuccessResponse_71(); } static void OnFailureCallback_72(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_72(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_72(status); } static void OnSuccessCallback_72(void * context, uint8_t driftCompensation) @@ -2894,7 +2920,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_73(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_73(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_73(status); } static void OnSuccessCallback_73(void * context, chip::CharSpan compensationText) @@ -2904,7 +2930,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_74(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_74(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_74(status); } static void OnSuccessCallback_74(void * context, uint8_t numberOfPrimaries) @@ -2914,14 +2940,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_75(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_75(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_75(status); } static void OnSuccessCallback_75(void * context) { (static_cast(context))->OnSuccessResponse_75(); } static void OnFailureCallback_76(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_76(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_76(status); } static void OnSuccessCallback_76(void * context, uint8_t numberOfPrimaries) @@ -2931,7 +2957,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_77(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_77(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_77(status); } static void OnSuccessCallback_77(void * context, uint16_t primary1X) @@ -2941,14 +2967,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_78(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_78(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_78(status); } static void OnSuccessCallback_78(void * context) { (static_cast(context))->OnSuccessResponse_78(); } static void OnFailureCallback_79(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_79(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_79(status); } static void OnSuccessCallback_79(void * context, uint16_t primary1X) @@ -2958,7 +2984,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_80(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_80(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_80(status); } static void OnSuccessCallback_80(void * context, uint16_t primary1Y) @@ -2968,14 +2994,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_81(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_81(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_81(status); } static void OnSuccessCallback_81(void * context) { (static_cast(context))->OnSuccessResponse_81(); } static void OnFailureCallback_82(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_82(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_82(status); } static void OnSuccessCallback_82(void * context, uint16_t primary1Y) @@ -2985,7 +3011,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_83(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_83(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_83(status); } static void OnSuccessCallback_83(void * context, uint8_t primary1Intensity) @@ -2995,7 +3021,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_84(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_84(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_84(status); } static void OnSuccessCallback_84(void * context, uint16_t primary2X) @@ -3005,14 +3031,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_85(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_85(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_85(status); } static void OnSuccessCallback_85(void * context) { (static_cast(context))->OnSuccessResponse_85(); } static void OnFailureCallback_86(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_86(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_86(status); } static void OnSuccessCallback_86(void * context, uint16_t primary2X) @@ -3022,7 +3048,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_87(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_87(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_87(status); } static void OnSuccessCallback_87(void * context, uint16_t primary2Y) @@ -3032,14 +3058,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_88(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_88(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_88(status); } static void OnSuccessCallback_88(void * context) { (static_cast(context))->OnSuccessResponse_88(); } static void OnFailureCallback_89(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_89(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_89(status); } static void OnSuccessCallback_89(void * context, uint16_t primary2Y) @@ -3049,7 +3075,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_90(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_90(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_90(status); } static void OnSuccessCallback_90(void * context, uint8_t primary2Intensity) @@ -3059,7 +3085,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_91(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_91(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_91(status); } static void OnSuccessCallback_91(void * context, uint16_t primary3X) @@ -3069,14 +3095,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_92(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_92(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_92(status); } static void OnSuccessCallback_92(void * context) { (static_cast(context))->OnSuccessResponse_92(); } static void OnFailureCallback_93(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_93(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_93(status); } static void OnSuccessCallback_93(void * context, uint16_t primary3X) @@ -3086,7 +3112,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_94(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_94(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_94(status); } static void OnSuccessCallback_94(void * context, uint16_t primary3Y) @@ -3096,14 +3122,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_95(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_95(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_95(status); } static void OnSuccessCallback_95(void * context) { (static_cast(context))->OnSuccessResponse_95(); } static void OnFailureCallback_96(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_96(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_96(status); } static void OnSuccessCallback_96(void * context, uint16_t primary3Y) @@ -3113,7 +3139,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_97(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_97(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_97(status); } static void OnSuccessCallback_97(void * context, uint8_t primary3Intensity) @@ -3123,7 +3149,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_98(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_98(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_98(status); } static void OnSuccessCallback_98(void * context, uint16_t primary4X) @@ -3133,14 +3159,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_99(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_99(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_99(status); } static void OnSuccessCallback_99(void * context) { (static_cast(context))->OnSuccessResponse_99(); } static void OnFailureCallback_100(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_100(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_100(status); } static void OnSuccessCallback_100(void * context, uint16_t primary4X) @@ -3150,7 +3176,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_101(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_101(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_101(status); } static void OnSuccessCallback_101(void * context, uint16_t primary4Y) @@ -3160,14 +3186,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_102(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_102(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_102(status); } static void OnSuccessCallback_102(void * context) { (static_cast(context))->OnSuccessResponse_102(); } static void OnFailureCallback_103(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_103(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_103(status); } static void OnSuccessCallback_103(void * context, uint16_t primary4Y) @@ -3177,7 +3203,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_104(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_104(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_104(status); } static void OnSuccessCallback_104(void * context, uint8_t primary4Intensity) @@ -3187,7 +3213,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_105(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_105(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_105(status); } static void OnSuccessCallback_105(void * context, uint16_t primary5X) @@ -3197,14 +3223,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_106(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_106(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_106(status); } static void OnSuccessCallback_106(void * context) { (static_cast(context))->OnSuccessResponse_106(); } static void OnFailureCallback_107(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_107(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_107(status); } static void OnSuccessCallback_107(void * context, uint16_t primary5X) @@ -3214,7 +3240,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_108(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_108(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_108(status); } static void OnSuccessCallback_108(void * context, uint16_t primary5Y) @@ -3224,14 +3250,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_109(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_109(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_109(status); } static void OnSuccessCallback_109(void * context) { (static_cast(context))->OnSuccessResponse_109(); } static void OnFailureCallback_110(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_110(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_110(status); } static void OnSuccessCallback_110(void * context, uint16_t primary5Y) @@ -3241,7 +3267,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_111(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_111(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_111(status); } static void OnSuccessCallback_111(void * context, uint8_t primary5Intensity) @@ -3251,7 +3277,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_112(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_112(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_112(status); } static void OnSuccessCallback_112(void * context, uint16_t primary6X) @@ -3261,14 +3287,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_113(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_113(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_113(status); } static void OnSuccessCallback_113(void * context) { (static_cast(context))->OnSuccessResponse_113(); } static void OnFailureCallback_114(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_114(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_114(status); } static void OnSuccessCallback_114(void * context, uint16_t primary6X) @@ -3278,7 +3304,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_115(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_115(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_115(status); } static void OnSuccessCallback_115(void * context, uint16_t primary6Y) @@ -3288,14 +3314,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_116(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_116(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_116(status); } static void OnSuccessCallback_116(void * context) { (static_cast(context))->OnSuccessResponse_116(); } static void OnFailureCallback_117(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_117(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_117(status); } static void OnSuccessCallback_117(void * context, uint16_t primary6Y) @@ -3305,7 +3331,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_118(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_118(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_118(status); } static void OnSuccessCallback_118(void * context, uint8_t primary6Intensity) @@ -3315,7 +3341,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_119(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_119(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_119(status); } static void OnSuccessCallback_119(void * context, uint16_t whitePointX) @@ -3325,14 +3351,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_120(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_120(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_120(status); } static void OnSuccessCallback_120(void * context) { (static_cast(context))->OnSuccessResponse_120(); } static void OnFailureCallback_121(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_121(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_121(status); } static void OnSuccessCallback_121(void * context, uint16_t whitePointX) @@ -3342,7 +3368,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_122(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_122(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_122(status); } static void OnSuccessCallback_122(void * context, uint16_t whitePointY) @@ -3352,14 +3378,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_123(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_123(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_123(status); } static void OnSuccessCallback_123(void * context) { (static_cast(context))->OnSuccessResponse_123(); } static void OnFailureCallback_124(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_124(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_124(status); } static void OnSuccessCallback_124(void * context, uint16_t whitePointY) @@ -3369,7 +3395,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_125(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_125(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_125(status); } static void OnSuccessCallback_125(void * context, uint16_t colorPointRX) @@ -3379,14 +3405,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_126(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_126(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_126(status); } static void OnSuccessCallback_126(void * context) { (static_cast(context))->OnSuccessResponse_126(); } static void OnFailureCallback_127(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_127(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_127(status); } static void OnSuccessCallback_127(void * context, uint16_t colorPointRX) @@ -3396,7 +3422,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_128(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_128(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_128(status); } static void OnSuccessCallback_128(void * context, uint16_t colorPointRY) @@ -3406,14 +3432,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_129(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_129(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_129(status); } static void OnSuccessCallback_129(void * context) { (static_cast(context))->OnSuccessResponse_129(); } static void OnFailureCallback_130(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_130(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_130(status); } static void OnSuccessCallback_130(void * context, uint16_t colorPointRY) @@ -3423,7 +3449,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_131(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_131(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_131(status); } static void OnSuccessCallback_131(void * context, uint8_t colorPointRIntensity) @@ -3433,7 +3459,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_132(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_132(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_132(status); } static void OnSuccessCallback_132(void * context, uint16_t colorPointGX) @@ -3443,14 +3469,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_133(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_133(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_133(status); } static void OnSuccessCallback_133(void * context) { (static_cast(context))->OnSuccessResponse_133(); } static void OnFailureCallback_134(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_134(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_134(status); } static void OnSuccessCallback_134(void * context, uint16_t colorPointGX) @@ -3460,7 +3486,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_135(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_135(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_135(status); } static void OnSuccessCallback_135(void * context, uint16_t colorPointGY) @@ -3470,14 +3496,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_136(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_136(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_136(status); } static void OnSuccessCallback_136(void * context) { (static_cast(context))->OnSuccessResponse_136(); } static void OnFailureCallback_137(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_137(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_137(status); } static void OnSuccessCallback_137(void * context, uint16_t colorPointGY) @@ -3487,7 +3513,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_138(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_138(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_138(status); } static void OnSuccessCallback_138(void * context, uint8_t colorPointGIntensity) @@ -3497,7 +3523,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_139(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_139(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_139(status); } static void OnSuccessCallback_139(void * context, uint16_t colorPointBX) @@ -3507,14 +3533,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_140(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_140(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_140(status); } static void OnSuccessCallback_140(void * context) { (static_cast(context))->OnSuccessResponse_140(); } static void OnFailureCallback_141(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_141(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_141(status); } static void OnSuccessCallback_141(void * context, uint16_t colorPointBX) @@ -3524,7 +3550,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_142(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_142(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_142(status); } static void OnSuccessCallback_142(void * context, uint16_t colorPointBY) @@ -3534,14 +3560,14 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_143(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_143(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_143(status); } static void OnSuccessCallback_143(void * context) { (static_cast(context))->OnSuccessResponse_143(); } static void OnFailureCallback_144(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_144(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_144(status); } static void OnSuccessCallback_144(void * context, uint16_t colorPointBY) @@ -3551,7 +3577,7 @@ class Test_TC_CC_2_1 : public TestCommand static void OnFailureCallback_145(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_145(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_145(status); } static void OnSuccessCallback_145(void * context, uint8_t colorPointBIntensity) @@ -3575,11 +3601,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_1, - OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint8_t currentHue) { @@ -3594,11 +3621,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint8_t currentHue) { @@ -3622,7 +3650,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) + void OnFailureResponse_3(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -3636,11 +3664,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_4, - OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint8_t currentHue) { @@ -3655,11 +3684,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_5, OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(uint8_t currentSaturation) { @@ -3674,11 +3704,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_6, OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(uint8_t currentSaturation) { @@ -3702,7 +3733,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) + void OnFailureResponse_7(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -3716,11 +3747,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_8, OnFailureCallback_8); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_8, OnFailureCallback_8)); + return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(uint8_t currentSaturation) { @@ -3735,11 +3767,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_9, - OnFailureCallback_9); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_9, OnFailureCallback_9)); + return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9(uint16_t currentX) { @@ -3754,11 +3787,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_10, - OnFailureCallback_10); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_10, OnFailureCallback_10)); + return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10(uint16_t currentX) { @@ -3782,7 +3816,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) + void OnFailureResponse_11(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -3796,11 +3830,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_12, - OnFailureCallback_12); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_12, OnFailureCallback_12)); + return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_12(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_12(uint16_t currentX) { @@ -3815,11 +3850,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_13, - OnFailureCallback_13); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_13, OnFailureCallback_13)); + return CHIP_NO_ERROR; } - void OnFailureResponse_13(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_13(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_13(uint16_t currentY) { @@ -3834,11 +3870,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_14, - OnFailureCallback_14); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_14, OnFailureCallback_14)); + return CHIP_NO_ERROR; } - void OnFailureResponse_14(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_14(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_14(uint16_t currentY) { @@ -3862,7 +3899,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_15(uint8_t status) + void OnFailureResponse_15(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -3876,11 +3913,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_16, - OnFailureCallback_16); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_16, OnFailureCallback_16)); + return CHIP_NO_ERROR; } - void OnFailureResponse_16(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_16(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_16(uint16_t currentY) { @@ -3895,11 +3933,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_17, OnFailureCallback_17); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_17, OnFailureCallback_17)); + return CHIP_NO_ERROR; } - void OnFailureResponse_17(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_17(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_17(uint16_t colorTemperature) { @@ -3915,11 +3954,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_18, - OnFailureCallback_18); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_18, OnFailureCallback_18)); + return CHIP_NO_ERROR; } - void OnFailureResponse_18(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_18(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_18(uint8_t colorMode) { @@ -3935,11 +3975,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_19, OnFailureCallback_19); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_19, OnFailureCallback_19)); + return CHIP_NO_ERROR; } - void OnFailureResponse_19(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_19(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_19(uint8_t colorControlOptions) { @@ -3954,11 +3995,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_20, OnFailureCallback_20); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_20, OnFailureCallback_20)); + return CHIP_NO_ERROR; } - void OnFailureResponse_20(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_20(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_20(uint8_t colorControlOptions) { @@ -3981,7 +4023,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_21(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_21(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_21() { NextTest(); } @@ -3991,11 +4033,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_22, OnFailureCallback_22); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_22, OnFailureCallback_22)); + return CHIP_NO_ERROR; } - void OnFailureResponse_22(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_22(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_22(uint8_t colorControlOptions) { @@ -4010,11 +4053,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_23, OnFailureCallback_23); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_23, OnFailureCallback_23)); + return CHIP_NO_ERROR; } - void OnFailureResponse_23(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_23(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_23(uint16_t enhancedCurrentHue) { @@ -4029,11 +4073,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_24, OnFailureCallback_24); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_24, OnFailureCallback_24)); + return CHIP_NO_ERROR; } - void OnFailureResponse_24(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_24(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_24(uint16_t enhancedCurrentHue) { @@ -4056,7 +4101,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_25(uint8_t status) + void OnFailureResponse_25(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -4070,11 +4115,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_26, OnFailureCallback_26); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_26, OnFailureCallback_26)); + return CHIP_NO_ERROR; } - void OnFailureResponse_26(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_26(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_26(uint16_t enhancedCurrentHue) { @@ -4089,11 +4135,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_27, OnFailureCallback_27); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_27, OnFailureCallback_27)); + return CHIP_NO_ERROR; } - void OnFailureResponse_27(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_27(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_27(uint8_t enhancedColorMode) { @@ -4108,11 +4155,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_28, OnFailureCallback_28); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_28, OnFailureCallback_28)); + return CHIP_NO_ERROR; } - void OnFailureResponse_28(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_28(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_28(uint8_t colorLoopActive) { @@ -4127,11 +4175,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_29, OnFailureCallback_29); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_29, OnFailureCallback_29)); + return CHIP_NO_ERROR; } - void OnFailureResponse_29(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_29(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_29(uint8_t colorLoopActive) { @@ -4154,7 +4203,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_30(uint8_t status) + void OnFailureResponse_30(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -4168,11 +4217,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_31, OnFailureCallback_31); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_31, OnFailureCallback_31)); + return CHIP_NO_ERROR; } - void OnFailureResponse_31(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_31(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_31(uint8_t colorLoopActive) { @@ -4187,11 +4237,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_32, OnFailureCallback_32); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_32, OnFailureCallback_32)); + return CHIP_NO_ERROR; } - void OnFailureResponse_32(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_32(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_32(uint8_t colorLoopDirection) { @@ -4206,11 +4257,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_33, OnFailureCallback_33); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_33, OnFailureCallback_33)); + return CHIP_NO_ERROR; } - void OnFailureResponse_33(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_33(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_33(uint8_t colorLoopDirection) { @@ -4233,7 +4285,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_34(uint8_t status) + void OnFailureResponse_34(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -4247,11 +4299,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_35, OnFailureCallback_35); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_35, OnFailureCallback_35)); + return CHIP_NO_ERROR; } - void OnFailureResponse_35(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_35(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_35(uint8_t colorLoopDirection) { @@ -4266,11 +4319,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_36, OnFailureCallback_36); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_36, OnFailureCallback_36)); + return CHIP_NO_ERROR; } - void OnFailureResponse_36(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_36(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_36(uint16_t colorLoopTime) { @@ -4285,11 +4339,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_37, OnFailureCallback_37); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_37, OnFailureCallback_37)); + return CHIP_NO_ERROR; } - void OnFailureResponse_37(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_37(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_37(uint16_t colorLoopTime) { @@ -4312,7 +4367,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_38(uint8_t status) + void OnFailureResponse_38(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -4326,11 +4381,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_39, OnFailureCallback_39); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_39, OnFailureCallback_39)); + return CHIP_NO_ERROR; } - void OnFailureResponse_39(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_39(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_39(uint16_t colorLoopTime) { @@ -4345,11 +4401,13 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_40, OnFailureCallback_40); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_40, OnFailureCallback_40)); + return CHIP_NO_ERROR; } - void OnFailureResponse_40(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_40(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_40(uint16_t colorLoopStartEnhancedHue) { @@ -4364,11 +4422,13 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_41, OnFailureCallback_41); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_41, OnFailureCallback_41)); + return CHIP_NO_ERROR; } - void OnFailureResponse_41(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_41(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_41(uint16_t colorLoopStartEnhancedHue) { @@ -4392,7 +4452,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_42(uint8_t status) + void OnFailureResponse_42(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -4406,11 +4466,13 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_43, OnFailureCallback_43); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_43, OnFailureCallback_43)); + return CHIP_NO_ERROR; } - void OnFailureResponse_43(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_43(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_43(uint16_t colorLoopStartEnhancedHue) { @@ -4425,11 +4487,13 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_44, OnFailureCallback_44); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_44, OnFailureCallback_44)); + return CHIP_NO_ERROR; } - void OnFailureResponse_44(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_44(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_44(uint16_t colorLoopStoredEnhancedHue) { @@ -4444,11 +4508,13 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_45, OnFailureCallback_45); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_45, OnFailureCallback_45)); + return CHIP_NO_ERROR; } - void OnFailureResponse_45(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_45(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_45(uint16_t colorLoopStoredEnhancedHue) { @@ -4472,7 +4538,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_46(uint8_t status) + void OnFailureResponse_46(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -4486,11 +4552,13 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_47, OnFailureCallback_47); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_47, OnFailureCallback_47)); + return CHIP_NO_ERROR; } - void OnFailureResponse_47(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_47(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_47(uint16_t colorLoopStoredEnhancedHue) { @@ -4505,11 +4573,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_48, OnFailureCallback_48); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_48, OnFailureCallback_48)); + return CHIP_NO_ERROR; } - void OnFailureResponse_48(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_48(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_48(uint16_t colorCapabilities) { @@ -4524,11 +4593,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_49, OnFailureCallback_49); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_49, OnFailureCallback_49)); + return CHIP_NO_ERROR; } - void OnFailureResponse_49(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_49(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_49(uint16_t colorCapabilities) { @@ -4552,7 +4622,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_50(uint8_t status) + void OnFailureResponse_50(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -4566,11 +4636,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_51, OnFailureCallback_51); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_51, OnFailureCallback_51)); + return CHIP_NO_ERROR; } - void OnFailureResponse_51(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_51(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_51(uint16_t colorCapabilities) { @@ -4585,11 +4656,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_52, OnFailureCallback_52); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_52, OnFailureCallback_52)); + return CHIP_NO_ERROR; } - void OnFailureResponse_52(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_52(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_52(uint16_t colorTempPhysicalMin) { @@ -4604,11 +4676,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_53, OnFailureCallback_53); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_53, OnFailureCallback_53)); + return CHIP_NO_ERROR; } - void OnFailureResponse_53(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_53(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_53(uint16_t colorTempPhysicalMin) { @@ -4632,7 +4705,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_54(uint8_t status) + void OnFailureResponse_54(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -4646,11 +4719,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_55, OnFailureCallback_55); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_55, OnFailureCallback_55)); + return CHIP_NO_ERROR; } - void OnFailureResponse_55(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_55(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_55(uint16_t colorTempPhysicalMin) { @@ -4665,11 +4739,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_56, OnFailureCallback_56); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_56, OnFailureCallback_56)); + return CHIP_NO_ERROR; } - void OnFailureResponse_56(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_56(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_56(uint16_t colorTempPhysicalMax) { @@ -4684,11 +4759,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_57, OnFailureCallback_57); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_57, OnFailureCallback_57)); + return CHIP_NO_ERROR; } - void OnFailureResponse_57(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_57(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_57(uint16_t colorTempPhysicalMax) { @@ -4712,7 +4788,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_58(uint8_t status) + void OnFailureResponse_58(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -4726,11 +4802,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_59, OnFailureCallback_59); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_59, OnFailureCallback_59)); + return CHIP_NO_ERROR; } - void OnFailureResponse_59(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_59(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_59(uint16_t colorTempPhysicalMax) { @@ -4745,11 +4822,13 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_60, OnFailureCallback_60); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_60, OnFailureCallback_60)); + return CHIP_NO_ERROR; } - void OnFailureResponse_60(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_60(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_60(uint16_t coupleColorTempToLevelMinMireds) { @@ -4773,7 +4852,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_61(uint8_t status) + void OnFailureResponse_61(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -4787,11 +4866,13 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_62, OnFailureCallback_62); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_62, OnFailureCallback_62)); + return CHIP_NO_ERROR; } - void OnFailureResponse_62(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_62(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_62(uint16_t coupleColorTempToLevelMinMireds) { @@ -4806,11 +4887,13 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_63, OnFailureCallback_63); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_63, OnFailureCallback_63)); + return CHIP_NO_ERROR; } - void OnFailureResponse_63(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_63(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_63(uint16_t startUpColorTemperatureMireds) { @@ -4835,7 +4918,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_64(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_64(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_64() { NextTest(); } @@ -4845,11 +4928,13 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_65, OnFailureCallback_65); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_65, OnFailureCallback_65)); + return CHIP_NO_ERROR; } - void OnFailureResponse_65(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_65(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_65(uint16_t startUpColorTemperatureMireds) { @@ -4864,11 +4949,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_66, OnFailureCallback_66); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_66, OnFailureCallback_66)); + return CHIP_NO_ERROR; } - void OnFailureResponse_66(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_66(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_66(uint16_t remainingTime) { @@ -4883,11 +4969,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_67, OnFailureCallback_67); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_67, OnFailureCallback_67)); + return CHIP_NO_ERROR; } - void OnFailureResponse_67(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_67(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_67(uint16_t remainingTime) { @@ -4911,7 +4998,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_68(uint8_t status) + void OnFailureResponse_68(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -4925,11 +5012,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_69, OnFailureCallback_69); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_69, OnFailureCallback_69)); + return CHIP_NO_ERROR; } - void OnFailureResponse_69(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_69(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_69(uint16_t remainingTime) { @@ -4944,11 +5032,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_70, OnFailureCallback_70); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_70, OnFailureCallback_70)); + return CHIP_NO_ERROR; } - void OnFailureResponse_70(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_70(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_70(uint8_t driftCompensation) { @@ -4972,7 +5061,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_71(uint8_t status) + void OnFailureResponse_71(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -4986,11 +5075,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_72, OnFailureCallback_72); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_72, OnFailureCallback_72)); + return CHIP_NO_ERROR; } - void OnFailureResponse_72(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_72(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_72(uint8_t driftCompensation) { @@ -5005,11 +5095,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_73, OnFailureCallback_73); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_73, OnFailureCallback_73)); + return CHIP_NO_ERROR; } - void OnFailureResponse_73(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_73(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_73(chip::CharSpan compensationText) { @@ -5025,11 +5116,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_74, OnFailureCallback_74); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_74, OnFailureCallback_74)); + return CHIP_NO_ERROR; } - void OnFailureResponse_74(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_74(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_74(uint8_t numberOfPrimaries) { @@ -5053,7 +5145,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_75(uint8_t status) + void OnFailureResponse_75(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -5067,11 +5159,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_76, OnFailureCallback_76); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_76, OnFailureCallback_76)); + return CHIP_NO_ERROR; } - void OnFailureResponse_76(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_76(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_76(uint8_t numberOfPrimaries) { @@ -5086,11 +5179,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_77, - OnFailureCallback_77); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_77, OnFailureCallback_77)); + return CHIP_NO_ERROR; } - void OnFailureResponse_77(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_77(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_77(uint16_t primary1X) { @@ -5114,7 +5208,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_78(uint8_t status) + void OnFailureResponse_78(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -5128,11 +5222,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_79, - OnFailureCallback_79); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_79, OnFailureCallback_79)); + return CHIP_NO_ERROR; } - void OnFailureResponse_79(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_79(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_79(uint16_t primary1X) { @@ -5147,11 +5242,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_80, - OnFailureCallback_80); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_80, OnFailureCallback_80)); + return CHIP_NO_ERROR; } - void OnFailureResponse_80(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_80(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_80(uint16_t primary1Y) { @@ -5175,7 +5271,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_81(uint8_t status) + void OnFailureResponse_81(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -5189,11 +5285,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_82, - OnFailureCallback_82); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_82, OnFailureCallback_82)); + return CHIP_NO_ERROR; } - void OnFailureResponse_82(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_82(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_82(uint16_t primary1Y) { @@ -5208,11 +5305,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_83, OnFailureCallback_83); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_83, OnFailureCallback_83)); + return CHIP_NO_ERROR; } - void OnFailureResponse_83(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_83(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_83(uint8_t primary1Intensity) { @@ -5227,11 +5325,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_84, - OnFailureCallback_84); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_84, OnFailureCallback_84)); + return CHIP_NO_ERROR; } - void OnFailureResponse_84(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_84(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_84(uint16_t primary2X) { @@ -5255,7 +5354,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_85(uint8_t status) + void OnFailureResponse_85(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -5269,11 +5368,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_86, - OnFailureCallback_86); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_86, OnFailureCallback_86)); + return CHIP_NO_ERROR; } - void OnFailureResponse_86(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_86(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_86(uint16_t primary2X) { @@ -5288,11 +5388,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_87, - OnFailureCallback_87); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_87, OnFailureCallback_87)); + return CHIP_NO_ERROR; } - void OnFailureResponse_87(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_87(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_87(uint16_t primary2Y) { @@ -5316,7 +5417,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_88(uint8_t status) + void OnFailureResponse_88(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -5330,11 +5431,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_89, - OnFailureCallback_89); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_89, OnFailureCallback_89)); + return CHIP_NO_ERROR; } - void OnFailureResponse_89(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_89(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_89(uint16_t primary2Y) { @@ -5349,11 +5451,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_90, OnFailureCallback_90); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_90, OnFailureCallback_90)); + return CHIP_NO_ERROR; } - void OnFailureResponse_90(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_90(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_90(uint8_t primary2Intensity) { @@ -5368,11 +5471,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_91, - OnFailureCallback_91); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_91, OnFailureCallback_91)); + return CHIP_NO_ERROR; } - void OnFailureResponse_91(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_91(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_91(uint16_t primary3X) { @@ -5396,7 +5500,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_92(uint8_t status) + void OnFailureResponse_92(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -5410,11 +5514,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_93, - OnFailureCallback_93); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_93, OnFailureCallback_93)); + return CHIP_NO_ERROR; } - void OnFailureResponse_93(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_93(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_93(uint16_t primary3X) { @@ -5429,11 +5534,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_94, - OnFailureCallback_94); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_94, OnFailureCallback_94)); + return CHIP_NO_ERROR; } - void OnFailureResponse_94(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_94(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_94(uint16_t primary3Y) { @@ -5457,7 +5563,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_95(uint8_t status) + void OnFailureResponse_95(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -5471,11 +5577,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_96, - OnFailureCallback_96); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_96, OnFailureCallback_96)); + return CHIP_NO_ERROR; } - void OnFailureResponse_96(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_96(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_96(uint16_t primary3Y) { @@ -5490,11 +5597,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_97, OnFailureCallback_97); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_97, OnFailureCallback_97)); + return CHIP_NO_ERROR; } - void OnFailureResponse_97(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_97(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_97(uint8_t primary3Intensity) { @@ -5509,11 +5617,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_98, - OnFailureCallback_98); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_98, OnFailureCallback_98)); + return CHIP_NO_ERROR; } - void OnFailureResponse_98(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_98(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_98(uint16_t primary4X) { @@ -5537,7 +5646,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_99(uint8_t status) + void OnFailureResponse_99(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -5551,11 +5660,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_100, OnFailureCallback_100); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_100, OnFailureCallback_100)); + return CHIP_NO_ERROR; } - void OnFailureResponse_100(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_100(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_100(uint16_t primary4X) { @@ -5570,11 +5680,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_101, OnFailureCallback_101); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_101, OnFailureCallback_101)); + return CHIP_NO_ERROR; } - void OnFailureResponse_101(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_101(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_101(uint16_t primary4Y) { @@ -5598,7 +5709,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_102(uint8_t status) + void OnFailureResponse_102(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -5612,11 +5723,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_103, OnFailureCallback_103); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_103, OnFailureCallback_103)); + return CHIP_NO_ERROR; } - void OnFailureResponse_103(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_103(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_103(uint16_t primary4Y) { @@ -5631,11 +5743,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_104, OnFailureCallback_104); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_104, OnFailureCallback_104)); + return CHIP_NO_ERROR; } - void OnFailureResponse_104(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_104(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_104(uint8_t primary4Intensity) { @@ -5650,11 +5763,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_105, OnFailureCallback_105); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_105, OnFailureCallback_105)); + return CHIP_NO_ERROR; } - void OnFailureResponse_105(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_105(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_105(uint16_t primary5X) { @@ -5678,7 +5792,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_106(uint8_t status) + void OnFailureResponse_106(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -5692,11 +5806,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_107, OnFailureCallback_107); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_107, OnFailureCallback_107)); + return CHIP_NO_ERROR; } - void OnFailureResponse_107(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_107(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_107(uint16_t primary5X) { @@ -5711,11 +5826,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_108, OnFailureCallback_108); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_108, OnFailureCallback_108)); + return CHIP_NO_ERROR; } - void OnFailureResponse_108(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_108(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_108(uint16_t primary5Y) { @@ -5739,7 +5855,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_109(uint8_t status) + void OnFailureResponse_109(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -5753,11 +5869,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_110, OnFailureCallback_110); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_110, OnFailureCallback_110)); + return CHIP_NO_ERROR; } - void OnFailureResponse_110(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_110(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_110(uint16_t primary5Y) { @@ -5772,11 +5889,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_111, OnFailureCallback_111); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_111, OnFailureCallback_111)); + return CHIP_NO_ERROR; } - void OnFailureResponse_111(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_111(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_111(uint8_t primary5Intensity) { @@ -5791,11 +5909,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_112, OnFailureCallback_112); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_112, OnFailureCallback_112)); + return CHIP_NO_ERROR; } - void OnFailureResponse_112(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_112(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_112(uint16_t primary6X) { @@ -5819,7 +5938,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_113(uint8_t status) + void OnFailureResponse_113(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -5833,11 +5952,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_114, OnFailureCallback_114); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_114, OnFailureCallback_114)); + return CHIP_NO_ERROR; } - void OnFailureResponse_114(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_114(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_114(uint16_t primary6X) { @@ -5852,11 +5972,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_115, OnFailureCallback_115); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_115, OnFailureCallback_115)); + return CHIP_NO_ERROR; } - void OnFailureResponse_115(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_115(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_115(uint16_t primary6Y) { @@ -5880,7 +6001,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_116(uint8_t status) + void OnFailureResponse_116(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -5894,11 +6015,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_117, OnFailureCallback_117); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_117, OnFailureCallback_117)); + return CHIP_NO_ERROR; } - void OnFailureResponse_117(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_117(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_117(uint16_t primary6Y) { @@ -5913,11 +6035,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_118, OnFailureCallback_118); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_118, OnFailureCallback_118)); + return CHIP_NO_ERROR; } - void OnFailureResponse_118(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_118(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_118(uint8_t primary6Intensity) { @@ -5932,11 +6055,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_119, OnFailureCallback_119); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_119, OnFailureCallback_119)); + return CHIP_NO_ERROR; } - void OnFailureResponse_119(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_119(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_119(uint16_t whitePointX) { @@ -5960,7 +6084,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_120(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_120(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_120() { NextTest(); } @@ -5970,11 +6094,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_121, OnFailureCallback_121); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_121, OnFailureCallback_121)); + return CHIP_NO_ERROR; } - void OnFailureResponse_121(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_121(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_121(uint16_t whitePointX) { @@ -5989,11 +6114,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_122, OnFailureCallback_122); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_122, OnFailureCallback_122)); + return CHIP_NO_ERROR; } - void OnFailureResponse_122(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_122(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_122(uint16_t whitePointY) { @@ -6017,7 +6143,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_123(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_123(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_123() { NextTest(); } @@ -6027,11 +6153,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_124, OnFailureCallback_124); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_124, OnFailureCallback_124)); + return CHIP_NO_ERROR; } - void OnFailureResponse_124(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_124(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_124(uint16_t whitePointY) { @@ -6046,11 +6173,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_125, OnFailureCallback_125); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_125, OnFailureCallback_125)); + return CHIP_NO_ERROR; } - void OnFailureResponse_125(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_125(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_125(uint16_t colorPointRX) { @@ -6074,7 +6202,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_126(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_126(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_126() { NextTest(); } @@ -6084,11 +6212,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_127, OnFailureCallback_127); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_127, OnFailureCallback_127)); + return CHIP_NO_ERROR; } - void OnFailureResponse_127(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_127(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_127(uint16_t colorPointRX) { @@ -6103,11 +6232,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_128, OnFailureCallback_128); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_128, OnFailureCallback_128)); + return CHIP_NO_ERROR; } - void OnFailureResponse_128(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_128(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_128(uint16_t colorPointRY) { @@ -6131,7 +6261,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_129(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_129(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_129() { NextTest(); } @@ -6141,11 +6271,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_130, OnFailureCallback_130); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_130, OnFailureCallback_130)); + return CHIP_NO_ERROR; } - void OnFailureResponse_130(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_130(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_130(uint16_t colorPointRY) { @@ -6160,11 +6291,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_131, OnFailureCallback_131); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_131, OnFailureCallback_131)); + return CHIP_NO_ERROR; } - void OnFailureResponse_131(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_131(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_131(uint8_t colorPointRIntensity) { @@ -6179,11 +6311,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_132, OnFailureCallback_132); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_132, OnFailureCallback_132)); + return CHIP_NO_ERROR; } - void OnFailureResponse_132(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_132(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_132(uint16_t colorPointGX) { @@ -6207,7 +6340,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_133(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_133(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_133() { NextTest(); } @@ -6217,11 +6350,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_134, OnFailureCallback_134); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_134, OnFailureCallback_134)); + return CHIP_NO_ERROR; } - void OnFailureResponse_134(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_134(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_134(uint16_t colorPointGX) { @@ -6236,11 +6370,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_135, OnFailureCallback_135); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_135, OnFailureCallback_135)); + return CHIP_NO_ERROR; } - void OnFailureResponse_135(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_135(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_135(uint16_t colorPointGY) { @@ -6264,7 +6399,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_136(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_136(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_136() { NextTest(); } @@ -6274,11 +6409,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_137, OnFailureCallback_137); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_137, OnFailureCallback_137)); + return CHIP_NO_ERROR; } - void OnFailureResponse_137(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_137(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_137(uint16_t colorPointGY) { @@ -6293,11 +6429,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_138, OnFailureCallback_138); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_138, OnFailureCallback_138)); + return CHIP_NO_ERROR; } - void OnFailureResponse_138(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_138(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_138(uint8_t colorPointGIntensity) { @@ -6312,11 +6449,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_139, OnFailureCallback_139); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_139, OnFailureCallback_139)); + return CHIP_NO_ERROR; } - void OnFailureResponse_139(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_139(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_139(uint16_t colorPointBX) { @@ -6340,7 +6478,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_140(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_140(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_140() { NextTest(); } @@ -6350,11 +6488,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_141, OnFailureCallback_141); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_141, OnFailureCallback_141)); + return CHIP_NO_ERROR; } - void OnFailureResponse_141(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_141(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_141(uint16_t colorPointBX) { @@ -6369,11 +6508,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_142, OnFailureCallback_142); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_142, OnFailureCallback_142)); + return CHIP_NO_ERROR; } - void OnFailureResponse_142(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_142(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_142(uint16_t colorPointBY) { @@ -6397,7 +6537,7 @@ class Test_TC_CC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_143(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_143(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_143() { NextTest(); } @@ -6407,11 +6547,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_144, OnFailureCallback_144); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_144, OnFailureCallback_144)); + return CHIP_NO_ERROR; } - void OnFailureResponse_144(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_144(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_144(uint16_t colorPointBY) { @@ -6426,11 +6567,12 @@ class Test_TC_CC_2_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_145, OnFailureCallback_145); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_145, OnFailureCallback_145)); + return CHIP_NO_ERROR; } - void OnFailureResponse_145(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_145(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_145(uint8_t colorPointBIntensity) { @@ -6521,7 +6663,7 @@ class Test_TC_CC_3_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -6531,7 +6673,7 @@ class Test_TC_CC_3_1 : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context, bool onOff) @@ -6568,7 +6710,7 @@ class Test_TC_CC_3_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -6578,11 +6720,12 @@ class Test_TC_CC_3_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -6615,7 +6758,7 @@ class Test_TC_CC_3_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -6643,7 +6786,7 @@ class Test_TC_CC_3_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -6671,7 +6814,7 @@ class Test_TC_CC_3_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -6699,7 +6842,7 @@ class Test_TC_CC_3_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6() { NextTest(); } @@ -6722,7 +6865,7 @@ class Test_TC_CC_3_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7() { NextTest(); } @@ -6732,11 +6875,12 @@ class Test_TC_CC_3_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_8, - OnFailureCallback_8); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_8, OnFailureCallback_8)); + return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(bool onOff) { @@ -6827,7 +6971,7 @@ class Test_TC_CC_3_2 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -6837,7 +6981,7 @@ class Test_TC_CC_3_2 : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context, bool onOff) @@ -6874,7 +7018,7 @@ class Test_TC_CC_3_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -6884,11 +7028,12 @@ class Test_TC_CC_3_2 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -6920,7 +7065,7 @@ class Test_TC_CC_3_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -6947,7 +7092,7 @@ class Test_TC_CC_3_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -6974,7 +7119,7 @@ class Test_TC_CC_3_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -7001,7 +7146,7 @@ class Test_TC_CC_3_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6() { NextTest(); } @@ -7024,7 +7169,7 @@ class Test_TC_CC_3_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7() { NextTest(); } @@ -7034,11 +7179,12 @@ class Test_TC_CC_3_2 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_8, - OnFailureCallback_8); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_8, OnFailureCallback_8)); + return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(bool onOff) { @@ -7121,7 +7267,7 @@ class Test_TC_CC_3_3 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -7131,7 +7277,7 @@ class Test_TC_CC_3_3 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, bool onOff) @@ -7168,7 +7314,7 @@ class Test_TC_CC_3_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -7178,11 +7324,12 @@ class Test_TC_CC_3_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -7215,7 +7362,7 @@ class Test_TC_CC_3_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -7243,7 +7390,7 @@ class Test_TC_CC_3_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -7266,7 +7413,7 @@ class Test_TC_CC_3_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -7276,11 +7423,12 @@ class Test_TC_CC_3_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_6, - OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(bool onOff) { @@ -7359,7 +7507,7 @@ class Test_TC_CC_4_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -7369,7 +7517,7 @@ class Test_TC_CC_4_1 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, bool onOff) @@ -7406,7 +7554,7 @@ class Test_TC_CC_4_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -7416,11 +7564,12 @@ class Test_TC_CC_4_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -7452,7 +7601,7 @@ class Test_TC_CC_4_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -7475,7 +7624,7 @@ class Test_TC_CC_4_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -7485,11 +7634,12 @@ class Test_TC_CC_4_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_5, - OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(bool onOff) { @@ -7588,7 +7738,7 @@ class Test_TC_CC_4_2 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -7598,7 +7748,7 @@ class Test_TC_CC_4_2 : public TestCommand static void OnFailureCallback_10(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_10(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_10(status); } static void OnSuccessCallback_10(void * context, bool onOff) @@ -7635,7 +7785,7 @@ class Test_TC_CC_4_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -7645,11 +7795,12 @@ class Test_TC_CC_4_2 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -7681,7 +7832,7 @@ class Test_TC_CC_4_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -7708,7 +7859,7 @@ class Test_TC_CC_4_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -7735,7 +7886,7 @@ class Test_TC_CC_4_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -7762,7 +7913,7 @@ class Test_TC_CC_4_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6() { NextTest(); } @@ -7789,7 +7940,7 @@ class Test_TC_CC_4_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7() { NextTest(); } @@ -7816,7 +7967,7 @@ class Test_TC_CC_4_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8() { NextTest(); } @@ -7839,7 +7990,7 @@ class Test_TC_CC_4_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9() { NextTest(); } @@ -7849,11 +8000,12 @@ class Test_TC_CC_4_2 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_10, - OnFailureCallback_10); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_10, OnFailureCallback_10)); + return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10(bool onOff) { @@ -7936,7 +8088,7 @@ class Test_TC_CC_4_3 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -7946,7 +8098,7 @@ class Test_TC_CC_4_3 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, bool onOff) @@ -7983,7 +8135,7 @@ class Test_TC_CC_4_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -7993,11 +8145,12 @@ class Test_TC_CC_4_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -8030,7 +8183,7 @@ class Test_TC_CC_4_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -8058,7 +8211,7 @@ class Test_TC_CC_4_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -8081,7 +8234,7 @@ class Test_TC_CC_4_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -8091,11 +8244,12 @@ class Test_TC_CC_4_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_6, - OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(bool onOff) { @@ -8174,7 +8328,7 @@ class Test_TC_CC_4_4 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -8184,7 +8338,7 @@ class Test_TC_CC_4_4 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, bool onOff) @@ -8221,7 +8375,7 @@ class Test_TC_CC_4_4 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -8231,11 +8385,12 @@ class Test_TC_CC_4_4 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -8268,7 +8423,7 @@ class Test_TC_CC_4_4 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -8291,7 +8446,7 @@ class Test_TC_CC_4_4 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -8301,11 +8456,12 @@ class Test_TC_CC_4_4 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_5, - OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(bool onOff) { @@ -8384,7 +8540,7 @@ class Test_TC_CC_5_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -8394,7 +8550,7 @@ class Test_TC_CC_5_1 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, bool onOff) @@ -8431,7 +8587,7 @@ class Test_TC_CC_5_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -8441,11 +8597,12 @@ class Test_TC_CC_5_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -8478,7 +8635,7 @@ class Test_TC_CC_5_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -8501,7 +8658,7 @@ class Test_TC_CC_5_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -8511,11 +8668,12 @@ class Test_TC_CC_5_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_5, - OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(bool onOff) { @@ -8598,7 +8756,7 @@ class Test_TC_CC_5_2 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -8608,7 +8766,7 @@ class Test_TC_CC_5_2 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, bool onOff) @@ -8645,7 +8803,7 @@ class Test_TC_CC_5_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -8655,11 +8813,12 @@ class Test_TC_CC_5_2 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -8691,7 +8850,7 @@ class Test_TC_CC_5_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -8716,7 +8875,7 @@ class Test_TC_CC_5_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -8739,7 +8898,7 @@ class Test_TC_CC_5_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -8749,11 +8908,12 @@ class Test_TC_CC_5_2 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_6, - OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(bool onOff) { @@ -8832,7 +8992,7 @@ class Test_TC_CC_5_3 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -8842,7 +9002,7 @@ class Test_TC_CC_5_3 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, bool onOff) @@ -8879,7 +9039,7 @@ class Test_TC_CC_5_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -8889,11 +9049,12 @@ class Test_TC_CC_5_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -8926,7 +9087,7 @@ class Test_TC_CC_5_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -8949,7 +9110,7 @@ class Test_TC_CC_5_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -8959,11 +9120,12 @@ class Test_TC_CC_5_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_5, - OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(bool onOff) { @@ -9042,7 +9204,7 @@ class Test_TC_CC_6_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -9052,7 +9214,7 @@ class Test_TC_CC_6_1 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, bool onOff) @@ -9089,7 +9251,7 @@ class Test_TC_CC_6_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -9099,11 +9261,12 @@ class Test_TC_CC_6_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -9135,7 +9298,7 @@ class Test_TC_CC_6_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -9158,7 +9321,7 @@ class Test_TC_CC_6_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -9168,11 +9331,12 @@ class Test_TC_CC_6_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_5, - OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(bool onOff) { @@ -9259,7 +9423,7 @@ class Test_TC_CC_6_2 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -9269,7 +9433,7 @@ class Test_TC_CC_6_2 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, bool onOff) @@ -9306,7 +9470,7 @@ class Test_TC_CC_6_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -9316,11 +9480,12 @@ class Test_TC_CC_6_2 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -9354,7 +9519,7 @@ class Test_TC_CC_6_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -9383,7 +9548,7 @@ class Test_TC_CC_6_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -9412,7 +9577,7 @@ class Test_TC_CC_6_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -9435,7 +9600,7 @@ class Test_TC_CC_6_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6() { NextTest(); } @@ -9445,11 +9610,12 @@ class Test_TC_CC_6_2 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_7, - OnFailureCallback_7); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(bool onOff) { @@ -9532,7 +9698,7 @@ class Test_TC_CC_6_3 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -9542,7 +9708,7 @@ class Test_TC_CC_6_3 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, bool onOff) @@ -9579,7 +9745,7 @@ class Test_TC_CC_6_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -9589,11 +9755,12 @@ class Test_TC_CC_6_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -9628,7 +9795,7 @@ class Test_TC_CC_6_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -9658,7 +9825,7 @@ class Test_TC_CC_6_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -9681,7 +9848,7 @@ class Test_TC_CC_6_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -9691,11 +9858,12 @@ class Test_TC_CC_6_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_6, - OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(bool onOff) { @@ -9779,7 +9947,7 @@ class Test_TC_CC_7_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -9789,7 +9957,7 @@ class Test_TC_CC_7_1 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint16_t remainingTime) @@ -9799,7 +9967,7 @@ class Test_TC_CC_7_1 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, bool onOff) @@ -9836,7 +10004,7 @@ class Test_TC_CC_7_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -9846,11 +10014,12 @@ class Test_TC_CC_7_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -9883,7 +10052,7 @@ class Test_TC_CC_7_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -9893,11 +10062,12 @@ class Test_TC_CC_7_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint16_t remainingTime) { @@ -9925,7 +10095,7 @@ class Test_TC_CC_7_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -9935,11 +10105,12 @@ class Test_TC_CC_7_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_6, - OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(bool onOff) { @@ -10030,7 +10201,7 @@ class Test_TC_CC_7_2 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -10040,7 +10211,7 @@ class Test_TC_CC_7_2 : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context, bool onOff) @@ -10077,7 +10248,7 @@ class Test_TC_CC_7_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -10087,11 +10258,12 @@ class Test_TC_CC_7_2 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -10123,7 +10295,7 @@ class Test_TC_CC_7_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -10150,7 +10322,7 @@ class Test_TC_CC_7_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -10177,7 +10349,7 @@ class Test_TC_CC_7_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -10204,7 +10376,7 @@ class Test_TC_CC_7_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6() { NextTest(); } @@ -10227,7 +10399,7 @@ class Test_TC_CC_7_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7() { NextTest(); } @@ -10237,11 +10409,12 @@ class Test_TC_CC_7_2 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_8, - OnFailureCallback_8); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_8, OnFailureCallback_8)); + return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(bool onOff) { @@ -10324,7 +10497,7 @@ class Test_TC_CC_7_3 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -10334,7 +10507,7 @@ class Test_TC_CC_7_3 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, bool onOff) @@ -10371,7 +10544,7 @@ class Test_TC_CC_7_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -10381,11 +10554,12 @@ class Test_TC_CC_7_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -10418,7 +10592,7 @@ class Test_TC_CC_7_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -10446,7 +10620,7 @@ class Test_TC_CC_7_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -10469,7 +10643,7 @@ class Test_TC_CC_7_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -10479,11 +10653,12 @@ class Test_TC_CC_7_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_6, - OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(bool onOff) { @@ -10562,7 +10737,7 @@ class Test_TC_CC_7_4 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -10572,7 +10747,7 @@ class Test_TC_CC_7_4 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, bool onOff) @@ -10609,7 +10784,7 @@ class Test_TC_CC_7_4 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -10619,11 +10794,12 @@ class Test_TC_CC_7_4 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -10656,7 +10832,7 @@ class Test_TC_CC_7_4 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -10679,7 +10855,7 @@ class Test_TC_CC_7_4 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -10689,11 +10865,12 @@ class Test_TC_CC_7_4 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_5, - OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(bool onOff) { @@ -10816,7 +10993,7 @@ class Test_TC_CC_8_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -10826,7 +11003,7 @@ class Test_TC_CC_8_1 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint8_t colorLoopDirection) @@ -10836,7 +11013,7 @@ class Test_TC_CC_8_1 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, uint16_t colorLoopTime) @@ -10846,7 +11023,7 @@ class Test_TC_CC_8_1 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, uint16_t colorLoopStartEnhancedHue) @@ -10856,7 +11033,7 @@ class Test_TC_CC_8_1 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, uint8_t colorLoopActive) @@ -10866,7 +11043,7 @@ class Test_TC_CC_8_1 : public TestCommand static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context, uint8_t colorLoopActive) @@ -10876,7 +11053,7 @@ class Test_TC_CC_8_1 : public TestCommand static void OnFailureCallback_11(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_11(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_11(status); } static void OnSuccessCallback_11(void * context, uint8_t colorLoopDirection) @@ -10886,7 +11063,7 @@ class Test_TC_CC_8_1 : public TestCommand static void OnFailureCallback_12(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_12(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_12(status); } static void OnSuccessCallback_12(void * context, uint16_t colorLoopTime) @@ -10896,7 +11073,7 @@ class Test_TC_CC_8_1 : public TestCommand static void OnFailureCallback_14(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_14(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_14(status); } static void OnSuccessCallback_14(void * context, uint8_t colorLoopDirection) @@ -10906,7 +11083,7 @@ class Test_TC_CC_8_1 : public TestCommand static void OnFailureCallback_16(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_16(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_16(status); } static void OnSuccessCallback_16(void * context, bool onOff) @@ -10943,7 +11120,7 @@ class Test_TC_CC_8_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -10953,11 +11130,12 @@ class Test_TC_CC_8_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -10992,7 +11170,7 @@ class Test_TC_CC_8_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -11002,11 +11180,12 @@ class Test_TC_CC_8_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint8_t colorLoopDirection) { @@ -11021,11 +11200,12 @@ class Test_TC_CC_8_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_5, OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(uint16_t colorLoopTime) { @@ -11040,11 +11220,13 @@ class Test_TC_CC_8_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_6, OnFailureCallback_6); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(uint16_t colorLoopStartEnhancedHue) { @@ -11059,11 +11241,12 @@ class Test_TC_CC_8_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_7, OnFailureCallback_7); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(uint8_t colorLoopActive) { @@ -11098,7 +11281,7 @@ class Test_TC_CC_8_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8() { NextTest(); } @@ -11108,11 +11291,12 @@ class Test_TC_CC_8_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_9, OnFailureCallback_9); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_9, OnFailureCallback_9)); + return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9(uint8_t colorLoopActive) { @@ -11147,7 +11331,7 @@ class Test_TC_CC_8_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10() { NextTest(); } @@ -11157,11 +11341,12 @@ class Test_TC_CC_8_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_11, OnFailureCallback_11); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_11, OnFailureCallback_11)); + return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11(uint8_t colorLoopDirection) { @@ -11176,11 +11361,12 @@ class Test_TC_CC_8_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_12, OnFailureCallback_12); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_12, OnFailureCallback_12)); + return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_12(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_12(uint16_t colorLoopTime) { @@ -11215,7 +11401,7 @@ class Test_TC_CC_8_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_13(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_13(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_13() { NextTest(); } @@ -11225,11 +11411,12 @@ class Test_TC_CC_8_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_14, OnFailureCallback_14); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_14, OnFailureCallback_14)); + return CHIP_NO_ERROR; } - void OnFailureResponse_14(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_14(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_14(uint8_t colorLoopDirection) { @@ -11257,7 +11444,7 @@ class Test_TC_CC_8_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_15(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_15(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_15() { NextTest(); } @@ -11267,11 +11454,12 @@ class Test_TC_CC_8_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_16, - OnFailureCallback_16); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_16, OnFailureCallback_16)); + return CHIP_NO_ERROR; } - void OnFailureResponse_16(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_16(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_16(bool onOff) { @@ -11475,7 +11663,7 @@ class Test_TC_CC_9_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -11485,7 +11673,7 @@ class Test_TC_CC_9_1 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint8_t colorLoopActive) @@ -11495,7 +11683,7 @@ class Test_TC_CC_9_1 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, uint8_t colorLoopDirection) @@ -11505,7 +11693,7 @@ class Test_TC_CC_9_1 : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context, uint16_t colorLoopTime) @@ -11515,7 +11703,7 @@ class Test_TC_CC_9_1 : public TestCommand static void OnFailureCallback_10(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_10(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_10(status); } static void OnSuccessCallback_10(void * context, uint16_t colorLoopStartEnhancedHue) @@ -11525,7 +11713,7 @@ class Test_TC_CC_9_1 : public TestCommand static void OnFailureCallback_12(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_12(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_12(status); } static void OnSuccessCallback_12(void * context, uint8_t colorLoopActive) @@ -11535,7 +11723,7 @@ class Test_TC_CC_9_1 : public TestCommand static void OnFailureCallback_14(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_14(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_14(status); } static void OnSuccessCallback_14(void * context, uint8_t colorLoopActive) @@ -11545,7 +11733,7 @@ class Test_TC_CC_9_1 : public TestCommand static void OnFailureCallback_16(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_16(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_16(status); } static void OnSuccessCallback_16(void * context, uint8_t colorLoopDirection) @@ -11555,7 +11743,7 @@ class Test_TC_CC_9_1 : public TestCommand static void OnFailureCallback_18(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_18(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_18(status); } static void OnSuccessCallback_18(void * context, uint8_t colorLoopActive) @@ -11565,7 +11753,7 @@ class Test_TC_CC_9_1 : public TestCommand static void OnFailureCallback_20(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_20(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_20(status); } static void OnSuccessCallback_20(void * context, uint8_t colorLoopActive) @@ -11575,7 +11763,7 @@ class Test_TC_CC_9_1 : public TestCommand static void OnFailureCallback_23(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_23(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_23(status); } static void OnSuccessCallback_23(void * context, uint16_t enhancedCurrentHue) @@ -11585,7 +11773,7 @@ class Test_TC_CC_9_1 : public TestCommand static void OnFailureCallback_25(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_25(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_25(status); } static void OnSuccessCallback_25(void * context, uint8_t colorLoopDirection) @@ -11595,7 +11783,7 @@ class Test_TC_CC_9_1 : public TestCommand static void OnFailureCallback_27(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_27(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_27(status); } static void OnSuccessCallback_27(void * context, uint8_t colorLoopActive) @@ -11605,7 +11793,7 @@ class Test_TC_CC_9_1 : public TestCommand static void OnFailureCallback_29(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_29(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_29(status); } static void OnSuccessCallback_29(void * context, uint8_t colorLoopActive) @@ -11615,7 +11803,7 @@ class Test_TC_CC_9_1 : public TestCommand static void OnFailureCallback_31(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_31(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_31(status); } static void OnSuccessCallback_31(void * context, uint8_t colorLoopDirection) @@ -11625,7 +11813,7 @@ class Test_TC_CC_9_1 : public TestCommand static void OnFailureCallback_33(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_33(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_33(status); } static void OnSuccessCallback_33(void * context, uint8_t colorLoopActive) @@ -11635,7 +11823,7 @@ class Test_TC_CC_9_1 : public TestCommand static void OnFailureCallback_35(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_35(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_35(status); } static void OnSuccessCallback_35(void * context, uint8_t colorLoopActive) @@ -11672,7 +11860,7 @@ class Test_TC_CC_9_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -11682,11 +11870,12 @@ class Test_TC_CC_9_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -11721,7 +11910,7 @@ class Test_TC_CC_9_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -11731,11 +11920,12 @@ class Test_TC_CC_9_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint8_t colorLoopActive) { @@ -11770,7 +11960,7 @@ class Test_TC_CC_9_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -11780,11 +11970,12 @@ class Test_TC_CC_9_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_6, OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(uint8_t colorLoopDirection) { @@ -11819,7 +12010,7 @@ class Test_TC_CC_9_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7() { NextTest(); } @@ -11829,11 +12020,12 @@ class Test_TC_CC_9_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_8, OnFailureCallback_8); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_8, OnFailureCallback_8)); + return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(uint16_t colorLoopTime) { @@ -11868,7 +12060,7 @@ class Test_TC_CC_9_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9() { NextTest(); } @@ -11878,11 +12070,13 @@ class Test_TC_CC_9_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_10, OnFailureCallback_10); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_10, OnFailureCallback_10)); + return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10(uint16_t colorLoopStartEnhancedHue) { @@ -11917,7 +12111,7 @@ class Test_TC_CC_9_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11() { NextTest(); } @@ -11927,11 +12121,12 @@ class Test_TC_CC_9_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_12, OnFailureCallback_12); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_12, OnFailureCallback_12)); + return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_12(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_12(uint8_t colorLoopActive) { @@ -11966,7 +12161,7 @@ class Test_TC_CC_9_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_13(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_13(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_13() { NextTest(); } @@ -11976,11 +12171,12 @@ class Test_TC_CC_9_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_14, OnFailureCallback_14); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_14, OnFailureCallback_14)); + return CHIP_NO_ERROR; } - void OnFailureResponse_14(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_14(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_14(uint8_t colorLoopActive) { @@ -12015,7 +12211,7 @@ class Test_TC_CC_9_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_15(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_15(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_15() { NextTest(); } @@ -12025,11 +12221,12 @@ class Test_TC_CC_9_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_16, OnFailureCallback_16); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_16, OnFailureCallback_16)); + return CHIP_NO_ERROR; } - void OnFailureResponse_16(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_16(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_16(uint8_t colorLoopDirection) { @@ -12064,7 +12261,7 @@ class Test_TC_CC_9_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_17(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_17(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_17() { NextTest(); } @@ -12074,11 +12271,12 @@ class Test_TC_CC_9_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_18, OnFailureCallback_18); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_18, OnFailureCallback_18)); + return CHIP_NO_ERROR; } - void OnFailureResponse_18(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_18(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_18(uint8_t colorLoopActive) { @@ -12113,7 +12311,7 @@ class Test_TC_CC_9_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_19(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_19(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_19() { NextTest(); } @@ -12123,11 +12321,12 @@ class Test_TC_CC_9_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_20, OnFailureCallback_20); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_20, OnFailureCallback_20)); + return CHIP_NO_ERROR; } - void OnFailureResponse_20(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_20(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_20(uint8_t colorLoopActive) { @@ -12160,7 +12359,7 @@ class Test_TC_CC_9_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_21(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_21(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_21() { NextTest(); } @@ -12176,11 +12375,12 @@ class Test_TC_CC_9_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_23, OnFailureCallback_23); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_23, OnFailureCallback_23)); + return CHIP_NO_ERROR; } - void OnFailureResponse_23(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_23(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_23(uint16_t enhancedCurrentHue) { @@ -12215,7 +12415,7 @@ class Test_TC_CC_9_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_24(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_24(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_24() { NextTest(); } @@ -12225,11 +12425,12 @@ class Test_TC_CC_9_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_25, OnFailureCallback_25); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_25, OnFailureCallback_25)); + return CHIP_NO_ERROR; } - void OnFailureResponse_25(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_25(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_25(uint8_t colorLoopDirection) { @@ -12264,7 +12465,7 @@ class Test_TC_CC_9_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_26(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_26(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_26() { NextTest(); } @@ -12274,11 +12475,12 @@ class Test_TC_CC_9_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_27, OnFailureCallback_27); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_27, OnFailureCallback_27)); + return CHIP_NO_ERROR; } - void OnFailureResponse_27(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_27(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_27(uint8_t colorLoopActive) { @@ -12313,7 +12515,7 @@ class Test_TC_CC_9_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_28(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_28(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_28() { NextTest(); } @@ -12323,11 +12525,12 @@ class Test_TC_CC_9_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_29, OnFailureCallback_29); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_29, OnFailureCallback_29)); + return CHIP_NO_ERROR; } - void OnFailureResponse_29(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_29(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_29(uint8_t colorLoopActive) { @@ -12362,7 +12565,7 @@ class Test_TC_CC_9_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_30(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_30(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_30() { NextTest(); } @@ -12372,11 +12575,12 @@ class Test_TC_CC_9_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_31, OnFailureCallback_31); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_31, OnFailureCallback_31)); + return CHIP_NO_ERROR; } - void OnFailureResponse_31(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_31(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_31(uint8_t colorLoopDirection) { @@ -12411,7 +12615,7 @@ class Test_TC_CC_9_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_32(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_32(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_32() { NextTest(); } @@ -12421,11 +12625,12 @@ class Test_TC_CC_9_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_33, OnFailureCallback_33); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_33, OnFailureCallback_33)); + return CHIP_NO_ERROR; } - void OnFailureResponse_33(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_33(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_33(uint8_t colorLoopActive) { @@ -12460,7 +12665,7 @@ class Test_TC_CC_9_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_34(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_34(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_34() { NextTest(); } @@ -12470,11 +12675,12 @@ class Test_TC_CC_9_1 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_35, OnFailureCallback_35); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_35, OnFailureCallback_35)); + return CHIP_NO_ERROR; } - void OnFailureResponse_35(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_35(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_35(uint8_t colorLoopActive) { @@ -12502,7 +12708,7 @@ class Test_TC_CC_9_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_36(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_36(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_36() { NextTest(); } }; @@ -12612,7 +12818,7 @@ class Test_TC_CC_9_2 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -12622,7 +12828,7 @@ class Test_TC_CC_9_2 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint8_t colorLoopActive) @@ -12632,7 +12838,7 @@ class Test_TC_CC_9_2 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, uint8_t colorLoopDirection) @@ -12642,7 +12848,7 @@ class Test_TC_CC_9_2 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, uint16_t colorLoopTime) @@ -12652,7 +12858,7 @@ class Test_TC_CC_9_2 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, uint16_t colorLoopStartEnhancedHue) @@ -12662,7 +12868,7 @@ class Test_TC_CC_9_2 : public TestCommand static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context, uint8_t colorLoopActive) @@ -12672,7 +12878,7 @@ class Test_TC_CC_9_2 : public TestCommand static void OnFailureCallback_11(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_11(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_11(status); } static void OnSuccessCallback_11(void * context, uint8_t colorLoopDirection) @@ -12682,7 +12888,7 @@ class Test_TC_CC_9_2 : public TestCommand static void OnFailureCallback_13(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_13(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_13(status); } static void OnSuccessCallback_13(void * context, uint8_t colorLoopActive) @@ -12719,7 +12925,7 @@ class Test_TC_CC_9_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -12729,11 +12935,12 @@ class Test_TC_CC_9_2 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -12768,7 +12975,7 @@ class Test_TC_CC_9_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -12778,11 +12985,12 @@ class Test_TC_CC_9_2 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint8_t colorLoopActive) { @@ -12797,11 +13005,12 @@ class Test_TC_CC_9_2 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_5, OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(uint8_t colorLoopDirection) { @@ -12816,11 +13025,12 @@ class Test_TC_CC_9_2 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_6, OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(uint16_t colorLoopTime) { @@ -12835,11 +13045,13 @@ class Test_TC_CC_9_2 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_7, OnFailureCallback_7); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(uint16_t colorLoopStartEnhancedHue) { @@ -12874,7 +13086,7 @@ class Test_TC_CC_9_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8() { NextTest(); } @@ -12884,11 +13096,12 @@ class Test_TC_CC_9_2 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_9, OnFailureCallback_9); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_9, OnFailureCallback_9)); + return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9(uint8_t colorLoopActive) { @@ -12923,7 +13136,7 @@ class Test_TC_CC_9_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10() { NextTest(); } @@ -12933,11 +13146,12 @@ class Test_TC_CC_9_2 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_11, OnFailureCallback_11); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_11, OnFailureCallback_11)); + return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11(uint8_t colorLoopDirection) { @@ -12972,7 +13186,7 @@ class Test_TC_CC_9_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_12(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_12() { NextTest(); } @@ -12982,11 +13196,12 @@ class Test_TC_CC_9_2 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_13, OnFailureCallback_13); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_13, OnFailureCallback_13)); + return CHIP_NO_ERROR; } - void OnFailureResponse_13(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_13(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_13(uint8_t colorLoopActive) { @@ -13014,7 +13229,7 @@ class Test_TC_CC_9_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_14(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_14(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_14() { NextTest(); } }; @@ -13124,7 +13339,7 @@ class Test_TC_CC_9_3 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -13134,7 +13349,7 @@ class Test_TC_CC_9_3 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint8_t colorLoopActive) @@ -13144,7 +13359,7 @@ class Test_TC_CC_9_3 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, uint8_t colorLoopDirection) @@ -13154,7 +13369,7 @@ class Test_TC_CC_9_3 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, uint16_t colorLoopTime) @@ -13164,7 +13379,7 @@ class Test_TC_CC_9_3 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, uint16_t colorLoopStartEnhancedHue) @@ -13174,7 +13389,7 @@ class Test_TC_CC_9_3 : public TestCommand static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context, uint8_t colorLoopActive) @@ -13184,7 +13399,7 @@ class Test_TC_CC_9_3 : public TestCommand static void OnFailureCallback_11(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_11(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_11(status); } static void OnSuccessCallback_11(void * context, uint16_t colorLoopTime) @@ -13194,7 +13409,7 @@ class Test_TC_CC_9_3 : public TestCommand static void OnFailureCallback_13(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_13(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_13(status); } static void OnSuccessCallback_13(void * context, uint8_t colorLoopActive) @@ -13231,7 +13446,7 @@ class Test_TC_CC_9_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -13241,11 +13456,12 @@ class Test_TC_CC_9_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -13280,7 +13496,7 @@ class Test_TC_CC_9_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -13290,11 +13506,12 @@ class Test_TC_CC_9_3 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint8_t colorLoopActive) { @@ -13309,11 +13526,12 @@ class Test_TC_CC_9_3 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_5, OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(uint8_t colorLoopDirection) { @@ -13328,11 +13546,12 @@ class Test_TC_CC_9_3 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_6, OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(uint16_t colorLoopTime) { @@ -13347,11 +13566,13 @@ class Test_TC_CC_9_3 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_7, OnFailureCallback_7); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(uint16_t colorLoopStartEnhancedHue) { @@ -13386,7 +13607,7 @@ class Test_TC_CC_9_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8() { NextTest(); } @@ -13396,11 +13617,12 @@ class Test_TC_CC_9_3 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_9, OnFailureCallback_9); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_9, OnFailureCallback_9)); + return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9(uint8_t colorLoopActive) { @@ -13435,7 +13657,7 @@ class Test_TC_CC_9_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10() { NextTest(); } @@ -13445,11 +13667,12 @@ class Test_TC_CC_9_3 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_11, OnFailureCallback_11); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_11, OnFailureCallback_11)); + return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11(uint16_t colorLoopTime) { @@ -13484,7 +13707,7 @@ class Test_TC_CC_9_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_12(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_12() { NextTest(); } @@ -13494,11 +13717,12 @@ class Test_TC_CC_9_3 : public TestCommand chip::Controller::ColorControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_13, OnFailureCallback_13); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_13, OnFailureCallback_13)); + return CHIP_NO_ERROR; } - void OnFailureResponse_13(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_13(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_13(uint8_t colorLoopActive) { @@ -13526,7 +13750,7 @@ class Test_TC_CC_9_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_14(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_14(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_14() { NextTest(); } }; @@ -13656,7 +13880,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t interactionModelVersion) @@ -13666,7 +13890,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, chip::CharSpan vendorName) @@ -13676,7 +13900,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint16_t vendorID) @@ -13686,7 +13910,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, chip::CharSpan productName) @@ -13696,7 +13920,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, uint16_t productID) @@ -13706,7 +13930,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, chip::CharSpan nodeLabel) @@ -13716,7 +13940,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, chip::CharSpan location) @@ -13726,7 +13950,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context, uint16_t hardwareVersion) @@ -13736,7 +13960,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context, chip::CharSpan hardwareVersionString) @@ -13746,7 +13970,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_10(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_10(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_10(status); } static void OnSuccessCallback_10(void * context, uint32_t softwareVersion) @@ -13756,7 +13980,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_11(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_11(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_11(status); } static void OnSuccessCallback_11(void * context, chip::CharSpan softwareVersionString) @@ -13766,7 +13990,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_12(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_12(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_12(status); } static void OnSuccessCallback_12(void * context, chip::CharSpan manufacturingDate) @@ -13776,7 +14000,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_13(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_13(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_13(status); } static void OnSuccessCallback_13(void * context, chip::CharSpan partNumber) @@ -13786,7 +14010,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_14(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_14(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_14(status); } static void OnSuccessCallback_14(void * context, chip::CharSpan productURL) @@ -13796,7 +14020,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_15(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_15(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_15(status); } static void OnSuccessCallback_15(void * context, chip::CharSpan productLabel) @@ -13806,7 +14030,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_16(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_16(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_16(status); } static void OnSuccessCallback_16(void * context, chip::CharSpan serialNumber) @@ -13816,7 +14040,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_17(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_17(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_17(status); } static void OnSuccessCallback_17(void * context, bool localConfigDisabled) @@ -13826,7 +14050,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_18(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_18(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_18(status); } static void OnSuccessCallback_18(void * context, bool reachable) @@ -13836,7 +14060,7 @@ class Test_TC_DM_1_1 : public TestCommand static void OnFailureCallback_19(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_19(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_19(status); } static void OnSuccessCallback_19(void * context, chip::CharSpan uniqueID) @@ -13860,11 +14084,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t interactionModelVersion) { @@ -13879,11 +14104,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(chip::CharSpan vendorName) { @@ -13899,11 +14125,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_3, - OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint16_t vendorID) { @@ -13918,11 +14145,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_4, - OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(chip::CharSpan productName) { @@ -13938,11 +14166,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_5, - OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(uint16_t productID) { @@ -13957,11 +14186,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_6, - OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(chip::CharSpan nodeLabel) { @@ -13977,11 +14207,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_7, - OnFailureCallback_7); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(chip::CharSpan location) { @@ -13998,11 +14229,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_8, - OnFailureCallback_8); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_8, OnFailureCallback_8)); + return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(uint16_t hardwareVersion) { @@ -14017,11 +14249,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_9, OnFailureCallback_9); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_9, OnFailureCallback_9)); + return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9(chip::CharSpan hardwareVersionString) { @@ -14038,11 +14271,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_10, - OnFailureCallback_10); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_10, OnFailureCallback_10)); + return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10(uint32_t softwareVersion) { @@ -14057,11 +14291,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_11, OnFailureCallback_11); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_11, OnFailureCallback_11)); + return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11(chip::CharSpan softwareVersionString) { @@ -14079,11 +14314,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_12, OnFailureCallback_12); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_12, OnFailureCallback_12)); + return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) + void OnFailureResponse_12(EmberAfStatus status) { (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) ? NextTest() : ThrowFailureResponse(); } @@ -14104,11 +14340,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_13, - OnFailureCallback_13); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_13, OnFailureCallback_13)); + return CHIP_NO_ERROR; } - void OnFailureResponse_13(uint8_t status) + void OnFailureResponse_13(EmberAfStatus status) { (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) ? NextTest() : ThrowFailureResponse(); } @@ -14127,11 +14364,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_14, - OnFailureCallback_14); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_14, OnFailureCallback_14)); + return CHIP_NO_ERROR; } - void OnFailureResponse_14(uint8_t status) + void OnFailureResponse_14(EmberAfStatus status) { (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) ? NextTest() : ThrowFailureResponse(); } @@ -14151,11 +14389,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_15, - OnFailureCallback_15); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_15, OnFailureCallback_15)); + return CHIP_NO_ERROR; } - void OnFailureResponse_15(uint8_t status) + void OnFailureResponse_15(EmberAfStatus status) { (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) ? NextTest() : ThrowFailureResponse(); } @@ -14174,11 +14413,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_16, - OnFailureCallback_16); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_16, OnFailureCallback_16)); + return CHIP_NO_ERROR; } - void OnFailureResponse_16(uint8_t status) + void OnFailureResponse_16(EmberAfStatus status) { (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) ? NextTest() : ThrowFailureResponse(); } @@ -14197,11 +14437,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_17, OnFailureCallback_17); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_17, OnFailureCallback_17)); + return CHIP_NO_ERROR; } - void OnFailureResponse_17(uint8_t status) + void OnFailureResponse_17(EmberAfStatus status) { (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) ? NextTest() : ThrowFailureResponse(); } @@ -14219,11 +14460,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_18, - OnFailureCallback_18); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_18, OnFailureCallback_18)); + return CHIP_NO_ERROR; } - void OnFailureResponse_18(uint8_t status) + void OnFailureResponse_18(EmberAfStatus status) { (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) ? NextTest() : ThrowFailureResponse(); } @@ -14241,11 +14483,12 @@ class Test_TC_DM_1_1 : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_19, - OnFailureCallback_19); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_19, OnFailureCallback_19)); + return CHIP_NO_ERROR; } - void OnFailureResponse_19(uint8_t status) + void OnFailureResponse_19(EmberAfStatus status) { (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) ? NextTest() : ThrowFailureResponse(); } @@ -14382,7 +14625,7 @@ class Test_TC_DM_2_2 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void @@ -14395,7 +14638,7 @@ class Test_TC_DM_2_2 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint8_t supportedFabrics) @@ -14405,7 +14648,7 @@ class Test_TC_DM_2_2 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint8_t commissionedFabrics) @@ -14415,7 +14658,7 @@ class Test_TC_DM_2_2 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, @@ -14440,11 +14683,12 @@ class Test_TC_DM_2_2 : public TestCommand chip::Controller::OperationalCredentialsClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(const chip::app::DataModel::DecodableList< chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & fabricsList) @@ -14462,11 +14706,13 @@ class Test_TC_DM_2_2 : public TestCommand chip::Controller::OperationalCredentialsClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint8_t supportedFabrics) { @@ -14481,11 +14727,13 @@ class Test_TC_DM_2_2 : public TestCommand chip::Controller::OperationalCredentialsClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint8_t commissionedFabrics) { @@ -14500,11 +14748,13 @@ class Test_TC_DM_2_2 : public TestCommand chip::Controller::OperationalCredentialsClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(const chip::app::DataModel::DecodableList & trustedRootCertificates) { @@ -14580,7 +14830,7 @@ class Test_TC_EMR_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t clusterRevision) @@ -14590,7 +14840,7 @@ class Test_TC_EMR_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint16_t clusterRevision) @@ -14600,14 +14850,14 @@ class Test_TC_EMR_1_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context) { (static_cast(context))->OnSuccessResponse_3(); } static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint16_t clusterRevision) @@ -14631,11 +14881,13 @@ class Test_TC_EMR_1_1 : public TestCommand chip::Controller::ElectricalMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t clusterRevision) { @@ -14650,11 +14902,13 @@ class Test_TC_EMR_1_1 : public TestCommand chip::Controller::ElectricalMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint16_t clusterRevision) { @@ -14678,7 +14932,7 @@ class Test_TC_EMR_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) + void OnFailureResponse_3(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -14692,11 +14946,13 @@ class Test_TC_EMR_1_1 : public TestCommand chip::Controller::ElectricalMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint16_t clusterRevision) { @@ -14764,7 +15020,7 @@ class Test_TC_FLW_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t clusterRevision) @@ -14774,7 +15030,7 @@ class Test_TC_FLW_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context) { (static_cast(context))->OnSuccessResponse_2(); } @@ -14795,11 +15051,12 @@ class Test_TC_FLW_1_1 : public TestCommand chip::Controller::FlowMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t clusterRevision) { @@ -14822,7 +15079,7 @@ class Test_TC_FLW_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) + void OnFailureResponse_2(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -14912,7 +15169,7 @@ class Test_TC_FLW_2_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, int16_t measuredValue) @@ -14922,7 +15179,7 @@ class Test_TC_FLW_2_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, int16_t minMeasuredValue) @@ -14932,7 +15189,7 @@ class Test_TC_FLW_2_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, int16_t maxMeasuredValue) @@ -14942,21 +15199,21 @@ class Test_TC_FLW_2_1 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context) { (static_cast(context))->OnSuccessResponse_4(); } static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context) { (static_cast(context))->OnSuccessResponse_5(); } static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, int16_t measuredValue) @@ -14966,7 +15223,7 @@ class Test_TC_FLW_2_1 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, int16_t minMeasuredValue) @@ -14976,7 +15233,7 @@ class Test_TC_FLW_2_1 : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context, int16_t maxMeasuredValue) @@ -15000,11 +15257,12 @@ class Test_TC_FLW_2_1 : public TestCommand chip::Controller::FlowMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(int16_t measuredValue) { @@ -15019,11 +15277,12 @@ class Test_TC_FLW_2_1 : public TestCommand chip::Controller::FlowMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(int16_t minMeasuredValue) { @@ -15038,11 +15297,12 @@ class Test_TC_FLW_2_1 : public TestCommand chip::Controller::FlowMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(int16_t maxMeasuredValue) { @@ -15065,7 +15325,7 @@ class Test_TC_FLW_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) + void OnFailureResponse_4(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -15087,7 +15347,7 @@ class Test_TC_FLW_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) + void OnFailureResponse_5(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -15101,11 +15361,12 @@ class Test_TC_FLW_2_1 : public TestCommand chip::Controller::FlowMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_6, OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(int16_t measuredValue) { @@ -15120,11 +15381,12 @@ class Test_TC_FLW_2_1 : public TestCommand chip::Controller::FlowMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_7, OnFailureCallback_7); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(int16_t minMeasuredValue) { @@ -15139,11 +15401,12 @@ class Test_TC_FLW_2_1 : public TestCommand chip::Controller::FlowMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_8, OnFailureCallback_8); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_8, OnFailureCallback_8)); + return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(int16_t maxMeasuredValue) { @@ -15210,7 +15473,7 @@ class Test_TC_FLW_2_2 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, int16_t measuredValue) @@ -15220,7 +15483,7 @@ class Test_TC_FLW_2_2 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, int16_t measuredValue) @@ -15244,11 +15507,12 @@ class Test_TC_FLW_2_2 : public TestCommand chip::Controller::FlowMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(int16_t measuredValue) { @@ -15263,11 +15527,12 @@ class Test_TC_FLW_2_2 : public TestCommand chip::Controller::FlowMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(int16_t measuredValue) { @@ -15343,7 +15608,7 @@ class Test_TC_ILL_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t clusterRevision) @@ -15353,7 +15618,7 @@ class Test_TC_ILL_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint16_t clusterRevision) @@ -15363,14 +15628,14 @@ class Test_TC_ILL_1_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context) { (static_cast(context))->OnSuccessResponse_3(); } static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint16_t clusterRevision) @@ -15394,11 +15659,13 @@ class Test_TC_ILL_1_1 : public TestCommand chip::Controller::IlluminanceMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t clusterRevision) { @@ -15413,11 +15680,13 @@ class Test_TC_ILL_1_1 : public TestCommand chip::Controller::IlluminanceMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint16_t clusterRevision) { @@ -15441,7 +15710,7 @@ class Test_TC_ILL_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) + void OnFailureResponse_3(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -15455,11 +15724,13 @@ class Test_TC_ILL_1_1 : public TestCommand chip::Controller::IlluminanceMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint16_t clusterRevision) { @@ -15527,7 +15798,7 @@ class Test_TC_LVL_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t clusterRevision) @@ -15537,7 +15808,7 @@ class Test_TC_LVL_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context) { (static_cast(context))->OnSuccessResponse_2(); } @@ -15558,11 +15829,12 @@ class Test_TC_LVL_1_1 : public TestCommand chip::Controller::LevelControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t clusterRevision) { @@ -15585,7 +15857,7 @@ class Test_TC_LVL_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) + void OnFailureResponse_2(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -15695,7 +15967,7 @@ class Test_TC_LVL_2_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint8_t currentLevel) @@ -15705,7 +15977,7 @@ class Test_TC_LVL_2_1 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint8_t currentLevel) @@ -15715,7 +15987,7 @@ class Test_TC_LVL_2_1 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, uint8_t currentLevel) @@ -15725,7 +15997,7 @@ class Test_TC_LVL_2_1 : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context, uint16_t onOffTransitionTime) @@ -15735,7 +16007,7 @@ class Test_TC_LVL_2_1 : public TestCommand static void OnFailureCallback_11(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_11(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_11(status); } static void OnSuccessCallback_11(void * context, uint8_t currentLevel) @@ -15759,11 +16031,12 @@ class Test_TC_LVL_2_1 : public TestCommand chip::Controller::LevelControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint8_t currentLevel) { @@ -15795,7 +16068,7 @@ class Test_TC_LVL_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2() { NextTest(); } @@ -15811,11 +16084,12 @@ class Test_TC_LVL_2_1 : public TestCommand chip::Controller::LevelControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint8_t currentLevel) { @@ -15847,7 +16121,7 @@ class Test_TC_LVL_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -15863,11 +16137,12 @@ class Test_TC_LVL_2_1 : public TestCommand chip::Controller::LevelControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_7, OnFailureCallback_7); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(uint8_t currentLevel) { @@ -15882,11 +16157,12 @@ class Test_TC_LVL_2_1 : public TestCommand chip::Controller::LevelControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_8, OnFailureCallback_8); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_8, OnFailureCallback_8)); + return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(uint16_t onOffTransitionTime) { @@ -15918,7 +16194,7 @@ class Test_TC_LVL_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9() { NextTest(); } @@ -15934,11 +16210,12 @@ class Test_TC_LVL_2_1 : public TestCommand chip::Controller::LevelControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_11, OnFailureCallback_11); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_11, OnFailureCallback_11)); + return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11(uint8_t currentLevel) { @@ -15970,7 +16247,7 @@ class Test_TC_LVL_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_12(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_12() { NextTest(); } @@ -16086,7 +16363,7 @@ class Test_TC_LVL_3_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint8_t currentLevel) @@ -16096,7 +16373,7 @@ class Test_TC_LVL_3_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint8_t maxLevel) @@ -16106,7 +16383,7 @@ class Test_TC_LVL_3_1 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, uint8_t currentLevel) @@ -16116,7 +16393,7 @@ class Test_TC_LVL_3_1 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, uint8_t minLevel) @@ -16126,7 +16403,7 @@ class Test_TC_LVL_3_1 : public TestCommand static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context, uint8_t currentLevel) @@ -16136,14 +16413,14 @@ class Test_TC_LVL_3_1 : public TestCommand static void OnFailureCallback_10(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_10(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_10(status); } static void OnSuccessCallback_10(void * context) { (static_cast(context))->OnSuccessResponse_10(); } static void OnFailureCallback_11(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_11(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_11(status); } static void OnSuccessCallback_11(void * context, const chip::app::DataModel::Nullable & defaultMoveRate) @@ -16153,7 +16430,7 @@ class Test_TC_LVL_3_1 : public TestCommand static void OnFailureCallback_14(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_14(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_14(status); } static void OnSuccessCallback_14(void * context, uint8_t currentLevel) @@ -16177,11 +16454,12 @@ class Test_TC_LVL_3_1 : public TestCommand chip::Controller::LevelControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint8_t currentLevel) { @@ -16196,11 +16474,12 @@ class Test_TC_LVL_3_1 : public TestCommand chip::Controller::LevelControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint8_t maxLevel) { @@ -16232,7 +16511,7 @@ class Test_TC_LVL_3_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -16248,11 +16527,12 @@ class Test_TC_LVL_3_1 : public TestCommand chip::Controller::LevelControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_5, OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(uint8_t currentLevel) { @@ -16267,11 +16547,12 @@ class Test_TC_LVL_3_1 : public TestCommand chip::Controller::LevelControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_6, - OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(uint8_t minLevel) { @@ -16303,7 +16584,7 @@ class Test_TC_LVL_3_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7() { NextTest(); } @@ -16319,11 +16600,12 @@ class Test_TC_LVL_3_1 : public TestCommand chip::Controller::LevelControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_9, OnFailureCallback_9); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_9, OnFailureCallback_9)); + return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9(uint8_t currentLevel) { @@ -16346,7 +16628,7 @@ class Test_TC_LVL_3_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10() { NextTest(); } @@ -16356,11 +16638,12 @@ class Test_TC_LVL_3_1 : public TestCommand chip::Controller::LevelControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_11, OnFailureCallback_11); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_11, OnFailureCallback_11)); + return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11(const chip::app::DataModel::Nullable & defaultMoveRate) { @@ -16393,7 +16676,7 @@ class Test_TC_LVL_3_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_12(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_12() { NextTest(); } @@ -16409,11 +16692,12 @@ class Test_TC_LVL_3_1 : public TestCommand chip::Controller::LevelControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_14, OnFailureCallback_14); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_14, OnFailureCallback_14)); + return CHIP_NO_ERROR; } - void OnFailureResponse_14(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_14(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_14(uint8_t currentLevel) { @@ -16516,7 +16800,7 @@ class Test_TC_LVL_4_1 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint8_t currentLevel) @@ -16526,7 +16810,7 @@ class Test_TC_LVL_4_1 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, uint8_t currentLevel) @@ -16536,7 +16820,7 @@ class Test_TC_LVL_4_1 : public TestCommand static void OnFailureCallback_10(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_10(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_10(status); } static void OnSuccessCallback_10(void * context, uint8_t currentLevel) @@ -16573,7 +16857,7 @@ class Test_TC_LVL_4_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -16601,7 +16885,7 @@ class Test_TC_LVL_4_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2() { NextTest(); } @@ -16617,11 +16901,12 @@ class Test_TC_LVL_4_1 : public TestCommand chip::Controller::LevelControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint8_t currentLevel) { @@ -16654,7 +16939,7 @@ class Test_TC_LVL_4_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -16670,11 +16955,12 @@ class Test_TC_LVL_4_1 : public TestCommand chip::Controller::LevelControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_7, OnFailureCallback_7); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(uint8_t currentLevel) { @@ -16707,7 +16993,7 @@ class Test_TC_LVL_4_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8() { NextTest(); } @@ -16723,11 +17009,12 @@ class Test_TC_LVL_4_1 : public TestCommand chip::Controller::LevelControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_10, OnFailureCallback_10); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_10, OnFailureCallback_10)); + return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10(uint8_t currentLevel) { @@ -16755,7 +17042,7 @@ class Test_TC_LVL_4_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11() { NextTest(); } }; @@ -16864,7 +17151,7 @@ class Test_TC_LVL_5_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -16892,7 +17179,7 @@ class Test_TC_LVL_5_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2() { NextTest(); } @@ -16925,7 +17212,7 @@ class Test_TC_LVL_5_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -16956,7 +17243,7 @@ class Test_TC_LVL_5_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6() { NextTest(); } @@ -16979,7 +17266,7 @@ class Test_TC_LVL_5_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7() { NextTest(); } }; @@ -17042,7 +17329,7 @@ class Test_TC_MC_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t clusterRevision) @@ -17052,7 +17339,7 @@ class Test_TC_MC_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context) { (static_cast(context))->OnSuccessResponse_2(); } @@ -17073,11 +17360,12 @@ class Test_TC_MC_1_1 : public TestCommand chip::Controller::MediaInputClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t clusterRevision) { @@ -17100,7 +17388,7 @@ class Test_TC_MC_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) + void OnFailureResponse_2(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -17189,7 +17477,7 @@ class Test_TC_MC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } }; @@ -17894,7 +18182,7 @@ class Test_TC_OCC_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t clusterRevision) @@ -17904,7 +18192,7 @@ class Test_TC_OCC_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint16_t clusterRevision) @@ -17914,7 +18202,7 @@ class Test_TC_OCC_1_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context) { (static_cast(context))->OnSuccessResponse_3(); } @@ -17935,11 +18223,12 @@ class Test_TC_OCC_1_1 : public TestCommand chip::Controller::OccupancySensingClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t clusterRevision) { @@ -17954,11 +18243,12 @@ class Test_TC_OCC_1_1 : public TestCommand chip::Controller::OccupancySensingClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint16_t clusterRevision) { @@ -17981,7 +18271,7 @@ class Test_TC_OCC_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) + void OnFailureResponse_3(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -18079,7 +18369,7 @@ class Test_TC_OCC_2_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint8_t occupancy) @@ -18089,14 +18379,14 @@ class Test_TC_OCC_2_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context) { (static_cast(context))->OnSuccessResponse_2(); } static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint8_t occupancy) @@ -18106,7 +18396,7 @@ class Test_TC_OCC_2_1 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint8_t occupancySensorType) @@ -18116,14 +18406,14 @@ class Test_TC_OCC_2_1 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context) { (static_cast(context))->OnSuccessResponse_5(); } static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, uint8_t occupancySensorType) @@ -18133,7 +18423,7 @@ class Test_TC_OCC_2_1 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, uint8_t occupancySensorTypeBitmap) @@ -18143,14 +18433,14 @@ class Test_TC_OCC_2_1 : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context) { (static_cast(context))->OnSuccessResponse_8(); } static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context, uint8_t occupancySensorTypeBitmap) @@ -18174,11 +18464,12 @@ class Test_TC_OCC_2_1 : public TestCommand chip::Controller::OccupancySensingClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint8_t occupancy) { @@ -18202,7 +18493,7 @@ class Test_TC_OCC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) + void OnFailureResponse_2(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -18216,11 +18507,12 @@ class Test_TC_OCC_2_1 : public TestCommand chip::Controller::OccupancySensingClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint8_t occupancy) { @@ -18235,11 +18527,13 @@ class Test_TC_OCC_2_1 : public TestCommand chip::Controller::OccupancySensingClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint8_t occupancySensorType) { @@ -18264,7 +18558,7 @@ class Test_TC_OCC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) + void OnFailureResponse_5(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -18278,11 +18572,13 @@ class Test_TC_OCC_2_1 : public TestCommand chip::Controller::OccupancySensingClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_6, OnFailureCallback_6); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(uint8_t occupancySensorType) { @@ -18297,11 +18593,13 @@ class Test_TC_OCC_2_1 : public TestCommand chip::Controller::OccupancySensingClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_7, OnFailureCallback_7); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(uint8_t occupancySensorTypeBitmap) { @@ -18327,7 +18625,7 @@ class Test_TC_OCC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) + void OnFailureResponse_8(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -18341,11 +18639,13 @@ class Test_TC_OCC_2_1 : public TestCommand chip::Controller::OccupancySensingClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_9, OnFailureCallback_9); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_9, OnFailureCallback_9)); + return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9(uint8_t occupancySensorTypeBitmap) { @@ -18412,7 +18712,7 @@ class Test_TC_OCC_2_2 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint8_t occupancy) @@ -18422,7 +18722,7 @@ class Test_TC_OCC_2_2 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint8_t occupancy) @@ -18446,11 +18746,12 @@ class Test_TC_OCC_2_2 : public TestCommand chip::Controller::OccupancySensingClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint8_t occupancy) { @@ -18465,11 +18766,12 @@ class Test_TC_OCC_2_2 : public TestCommand chip::Controller::OccupancySensingClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint8_t occupancy) { @@ -18565,7 +18867,7 @@ class Test_TC_OO_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint16_t clusterRevision) @@ -18575,7 +18877,7 @@ class Test_TC_OO_1_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint16_t clusterRevision) @@ -18585,14 +18887,14 @@ class Test_TC_OO_1_1 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context) { (static_cast(context))->OnSuccessResponse_4(); } static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, uint16_t clusterRevision) @@ -18602,7 +18904,7 @@ class Test_TC_OO_1_1 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, uint32_t featureMap) @@ -18612,7 +18914,7 @@ class Test_TC_OO_1_1 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, uint32_t featureMap) @@ -18622,14 +18924,14 @@ class Test_TC_OO_1_1 : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context) { (static_cast(context))->OnSuccessResponse_8(); } static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context, uint32_t featureMap) @@ -18659,11 +18961,12 @@ class Test_TC_OO_1_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint16_t clusterRevision) { @@ -18678,11 +18981,12 @@ class Test_TC_OO_1_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_3, - OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint16_t clusterRevision) { @@ -18705,7 +19009,7 @@ class Test_TC_OO_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) + void OnFailureResponse_4(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -18719,11 +19023,12 @@ class Test_TC_OO_1_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_5, - OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(uint16_t clusterRevision) { @@ -18738,11 +19043,12 @@ class Test_TC_OO_1_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_6, - OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(uint32_t featureMap) { @@ -18757,11 +19063,12 @@ class Test_TC_OO_1_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_7, - OnFailureCallback_7); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(uint32_t featureMap) { @@ -18784,7 +19091,7 @@ class Test_TC_OO_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) + void OnFailureResponse_8(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -18798,11 +19105,12 @@ class Test_TC_OO_1_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_9, - OnFailureCallback_9); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_9, OnFailureCallback_9)); + return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9(uint32_t featureMap) { @@ -18909,7 +19217,7 @@ class Test_TC_OO_2_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, bool onOff) @@ -18919,7 +19227,7 @@ class Test_TC_OO_2_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -18929,7 +19237,7 @@ class Test_TC_OO_2_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, bool globalSceneControl) @@ -18939,7 +19247,7 @@ class Test_TC_OO_2_1 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint16_t onTime) @@ -18949,7 +19257,7 @@ class Test_TC_OO_2_1 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, uint16_t offWaitTime) @@ -18959,7 +19267,7 @@ class Test_TC_OO_2_1 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, uint8_t startUpOnOff) @@ -18969,28 +19277,28 @@ class Test_TC_OO_2_1 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context) { (static_cast(context))->OnSuccessResponse_7(); } static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context) { (static_cast(context))->OnSuccessResponse_8(); } static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context) { (static_cast(context))->OnSuccessResponse_9(); } static void OnFailureCallback_10(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_10(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_10(status); } static void OnSuccessCallback_10(void * context, uint16_t onTime) @@ -19000,7 +19308,7 @@ class Test_TC_OO_2_1 : public TestCommand static void OnFailureCallback_11(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_11(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_11(status); } static void OnSuccessCallback_11(void * context, uint16_t offWaitTime) @@ -19010,7 +19318,7 @@ class Test_TC_OO_2_1 : public TestCommand static void OnFailureCallback_12(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_12(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_12(status); } static void OnSuccessCallback_12(void * context, uint8_t startUpOnOff) @@ -19034,11 +19342,12 @@ class Test_TC_OO_2_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_1, - OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(bool onOff) { @@ -19053,11 +19362,12 @@ class Test_TC_OO_2_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -19072,11 +19382,12 @@ class Test_TC_OO_2_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(bool globalSceneControl) { @@ -19091,11 +19402,12 @@ class Test_TC_OO_2_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_4, - OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint16_t onTime) { @@ -19110,11 +19422,12 @@ class Test_TC_OO_2_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_5, - OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(uint16_t offWaitTime) { @@ -19129,11 +19442,12 @@ class Test_TC_OO_2_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_6, - OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(uint8_t startUpOnOff) { @@ -19156,7 +19470,7 @@ class Test_TC_OO_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7() { NextTest(); } @@ -19174,7 +19488,7 @@ class Test_TC_OO_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8() { NextTest(); } @@ -19192,7 +19506,7 @@ class Test_TC_OO_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9() { NextTest(); } @@ -19202,11 +19516,12 @@ class Test_TC_OO_2_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_10, - OnFailureCallback_10); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_10, OnFailureCallback_10)); + return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10(uint16_t onTime) { @@ -19221,11 +19536,12 @@ class Test_TC_OO_2_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_11, - OnFailureCallback_11); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_11, OnFailureCallback_11)); + return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11(uint16_t offWaitTime) { @@ -19240,11 +19556,12 @@ class Test_TC_OO_2_1 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_12, - OnFailureCallback_12); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_12, OnFailureCallback_12)); + return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_12(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_12(uint8_t startUpOnOff) { @@ -19359,7 +19676,7 @@ class Test_TC_OO_2_2 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, bool onOff) @@ -19369,7 +19686,7 @@ class Test_TC_OO_2_2 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, bool onOff) @@ -19379,7 +19696,7 @@ class Test_TC_OO_2_2 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, bool onOff) @@ -19389,7 +19706,7 @@ class Test_TC_OO_2_2 : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context, bool onOff) @@ -19399,7 +19716,7 @@ class Test_TC_OO_2_2 : public TestCommand static void OnFailureCallback_10(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_10(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_10(status); } static void OnSuccessCallback_10(void * context, bool onOff) @@ -19409,7 +19726,7 @@ class Test_TC_OO_2_2 : public TestCommand static void OnFailureCallback_12(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_12(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_12(status); } static void OnSuccessCallback_12(void * context, bool onOff) @@ -19419,7 +19736,7 @@ class Test_TC_OO_2_2 : public TestCommand static void OnFailureCallback_14(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_14(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_14(status); } static void OnSuccessCallback_14(void * context, bool onOff) @@ -19456,7 +19773,7 @@ class Test_TC_OO_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -19466,11 +19783,12 @@ class Test_TC_OO_2_2 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { @@ -19498,7 +19816,7 @@ class Test_TC_OO_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -19508,11 +19826,12 @@ class Test_TC_OO_2_2 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_4, - OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(bool onOff) { @@ -19540,7 +19859,7 @@ class Test_TC_OO_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -19550,11 +19869,12 @@ class Test_TC_OO_2_2 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_6, - OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(bool onOff) { @@ -19582,7 +19902,7 @@ class Test_TC_OO_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7() { NextTest(); } @@ -19592,11 +19912,12 @@ class Test_TC_OO_2_2 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_8, - OnFailureCallback_8); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_8, OnFailureCallback_8)); + return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(bool onOff) { @@ -19624,7 +19945,7 @@ class Test_TC_OO_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9() { NextTest(); } @@ -19634,11 +19955,12 @@ class Test_TC_OO_2_2 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_10, - OnFailureCallback_10); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_10, OnFailureCallback_10)); + return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10(bool onOff) { @@ -19666,7 +19988,7 @@ class Test_TC_OO_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11() { NextTest(); } @@ -19676,11 +19998,12 @@ class Test_TC_OO_2_2 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_12, - OnFailureCallback_12); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_12, OnFailureCallback_12)); + return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_12(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_12(bool onOff) { @@ -19708,7 +20031,7 @@ class Test_TC_OO_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_13(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_13(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_13() { NextTest(); } @@ -19718,11 +20041,12 @@ class Test_TC_OO_2_2 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_14, - OnFailureCallback_14); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_14, OnFailureCallback_14)); + return CHIP_NO_ERROR; } - void OnFailureResponse_14(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_14(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_14(bool onOff) { @@ -19965,7 +20289,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, bool onOff) @@ -19975,7 +20299,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, bool globalSceneControl) @@ -19985,7 +20309,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, bool onOff) @@ -19995,7 +20319,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context, bool globalSceneControl) @@ -20005,7 +20329,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_11(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_11(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_11(status); } static void OnSuccessCallback_11(void * context, bool onOff) @@ -20015,7 +20339,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_12(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_12(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_12(status); } static void OnSuccessCallback_12(void * context, bool globalSceneControl) @@ -20025,7 +20349,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_13(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_13(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_13(status); } static void OnSuccessCallback_13(void * context, uint16_t onTime) @@ -20035,7 +20359,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_14(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_14(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_14(status); } static void OnSuccessCallback_14(void * context, uint16_t offWaitTime) @@ -20045,7 +20369,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_16(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_16(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_16(status); } static void OnSuccessCallback_16(void * context, bool onOff) @@ -20055,7 +20379,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_17(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_17(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_17(status); } static void OnSuccessCallback_17(void * context, uint16_t onTime) @@ -20065,7 +20389,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_18(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_18(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_18(status); } static void OnSuccessCallback_18(void * context, uint16_t offWaitTime) @@ -20075,7 +20399,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_20(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_20(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_20(status); } static void OnSuccessCallback_20(void * context, bool onOff) @@ -20085,7 +20409,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_21(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_21(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_21(status); } static void OnSuccessCallback_21(void * context, uint16_t onTime) @@ -20095,7 +20419,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_22(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_22(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_22(status); } static void OnSuccessCallback_22(void * context, bool onOff) @@ -20105,7 +20429,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_23(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_23(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_23(status); } static void OnSuccessCallback_23(void * context, uint16_t onTime) @@ -20115,7 +20439,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_24(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_24(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_24(status); } static void OnSuccessCallback_24(void * context, uint16_t offWaitTime) @@ -20125,7 +20449,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_26(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_26(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_26(status); } static void OnSuccessCallback_26(void * context, uint16_t onTime) @@ -20135,7 +20459,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_27(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_27(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_27(status); } static void OnSuccessCallback_27(void * context, uint16_t offWaitTime) @@ -20145,7 +20469,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_29(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_29(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_29(status); } static void OnSuccessCallback_29(void * context, bool onOff) @@ -20155,7 +20479,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_30(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_30(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_30(status); } static void OnSuccessCallback_30(void * context, uint16_t onTime) @@ -20165,7 +20489,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_31(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_31(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_31(status); } static void OnSuccessCallback_31(void * context, bool onOff) @@ -20175,7 +20499,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_32(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_32(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_32(status); } static void OnSuccessCallback_32(void * context, uint16_t onTime) @@ -20185,7 +20509,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_34(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_34(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_34(status); } static void OnSuccessCallback_34(void * context, bool onOff) @@ -20195,7 +20519,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_35(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_35(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_35(status); } static void OnSuccessCallback_35(void * context, uint16_t onTime) @@ -20205,7 +20529,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_36(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_36(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_36(status); } static void OnSuccessCallback_36(void * context, uint16_t offWaitTime) @@ -20215,7 +20539,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_38(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_38(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_38(status); } static void OnSuccessCallback_38(void * context, bool onOff) @@ -20225,7 +20549,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_39(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_39(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_39(status); } static void OnSuccessCallback_39(void * context, uint16_t onTime) @@ -20235,7 +20559,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_40(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_40(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_40(status); } static void OnSuccessCallback_40(void * context, bool onOff) @@ -20245,7 +20569,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_41(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_41(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_41(status); } static void OnSuccessCallback_41(void * context, uint16_t onTime) @@ -20255,7 +20579,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_42(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_42(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_42(status); } static void OnSuccessCallback_42(void * context, uint16_t offWaitTime) @@ -20265,7 +20589,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_43(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_43(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_43(status); } static void OnSuccessCallback_43(void * context, bool onOff) @@ -20275,7 +20599,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_44(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_44(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_44(status); } static void OnSuccessCallback_44(void * context, uint16_t onTime) @@ -20285,7 +20609,7 @@ class Test_TC_OO_2_3 : public TestCommand static void OnFailureCallback_45(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_45(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_45(status); } static void OnSuccessCallback_45(void * context, uint16_t offWaitTime) @@ -20322,7 +20646,7 @@ class Test_TC_OO_2_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -20338,11 +20662,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_3, - OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(bool onOff) { @@ -20357,11 +20682,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(bool globalSceneControl) { @@ -20389,7 +20715,7 @@ class Test_TC_OO_2_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -20405,11 +20731,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_7, - OnFailureCallback_7); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(bool onOff) { @@ -20424,11 +20751,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_8, OnFailureCallback_8); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_8, OnFailureCallback_8)); + return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(bool globalSceneControl) { @@ -20456,7 +20784,7 @@ class Test_TC_OO_2_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9() { NextTest(); } @@ -20472,11 +20800,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_11, - OnFailureCallback_11); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_11, OnFailureCallback_11)); + return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11(bool onOff) { @@ -20491,11 +20820,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_12, OnFailureCallback_12); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_12, OnFailureCallback_12)); + return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_12(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_12(bool globalSceneControl) { @@ -20510,11 +20840,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_13, - OnFailureCallback_13); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_13, OnFailureCallback_13)); + return CHIP_NO_ERROR; } - void OnFailureResponse_13(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_13(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_13(uint16_t onTime) { @@ -20529,11 +20860,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_14, - OnFailureCallback_14); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_14, OnFailureCallback_14)); + return CHIP_NO_ERROR; } - void OnFailureResponse_14(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_14(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_14(uint16_t offWaitTime) { @@ -20561,7 +20893,7 @@ class Test_TC_OO_2_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_15(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_15(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_15() { NextTest(); } @@ -20571,11 +20903,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_16, - OnFailureCallback_16); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_16, OnFailureCallback_16)); + return CHIP_NO_ERROR; } - void OnFailureResponse_16(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_16(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_16(bool onOff) { @@ -20590,11 +20923,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_17, - OnFailureCallback_17); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_17, OnFailureCallback_17)); + return CHIP_NO_ERROR; } - void OnFailureResponse_17(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_17(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_17(uint16_t onTime) { @@ -20609,11 +20943,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_18, - OnFailureCallback_18); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_18, OnFailureCallback_18)); + return CHIP_NO_ERROR; } - void OnFailureResponse_18(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_18(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_18(uint16_t offWaitTime) { @@ -20641,7 +20976,7 @@ class Test_TC_OO_2_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_19(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_19(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_19() { NextTest(); } @@ -20651,11 +20986,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_20, - OnFailureCallback_20); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_20, OnFailureCallback_20)); + return CHIP_NO_ERROR; } - void OnFailureResponse_20(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_20(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_20(bool onOff) { @@ -20670,11 +21006,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_21, - OnFailureCallback_21); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_21, OnFailureCallback_21)); + return CHIP_NO_ERROR; } - void OnFailureResponse_21(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_21(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_21(uint16_t onTime) { @@ -20689,11 +21026,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_22, - OnFailureCallback_22); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_22, OnFailureCallback_22)); + return CHIP_NO_ERROR; } - void OnFailureResponse_22(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_22(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_22(bool onOff) { @@ -20708,11 +21046,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_23, - OnFailureCallback_23); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_23, OnFailureCallback_23)); + return CHIP_NO_ERROR; } - void OnFailureResponse_23(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_23(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_23(uint16_t onTime) { @@ -20727,11 +21066,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_24, - OnFailureCallback_24); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_24, OnFailureCallback_24)); + return CHIP_NO_ERROR; } - void OnFailureResponse_24(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_24(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_24(uint16_t offWaitTime) { @@ -20759,7 +21099,7 @@ class Test_TC_OO_2_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_25(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_25(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_25() { NextTest(); } @@ -20769,11 +21109,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_26, - OnFailureCallback_26); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_26, OnFailureCallback_26)); + return CHIP_NO_ERROR; } - void OnFailureResponse_26(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_26(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_26(uint16_t onTime) { @@ -20788,11 +21129,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_27, - OnFailureCallback_27); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_27, OnFailureCallback_27)); + return CHIP_NO_ERROR; } - void OnFailureResponse_27(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_27(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_27(uint16_t offWaitTime) { @@ -20820,7 +21162,7 @@ class Test_TC_OO_2_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_28(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_28(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_28() { NextTest(); } @@ -20830,11 +21172,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_29, - OnFailureCallback_29); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_29, OnFailureCallback_29)); + return CHIP_NO_ERROR; } - void OnFailureResponse_29(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_29(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_29(bool onOff) { @@ -20849,11 +21192,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_30, - OnFailureCallback_30); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_30, OnFailureCallback_30)); + return CHIP_NO_ERROR; } - void OnFailureResponse_30(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_30(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_30(uint16_t onTime) { @@ -20868,11 +21212,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_31, - OnFailureCallback_31); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_31, OnFailureCallback_31)); + return CHIP_NO_ERROR; } - void OnFailureResponse_31(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_31(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_31(bool onOff) { @@ -20887,11 +21232,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_32, - OnFailureCallback_32); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_32, OnFailureCallback_32)); + return CHIP_NO_ERROR; } - void OnFailureResponse_32(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_32(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_32(uint16_t onTime) { @@ -20919,7 +21265,7 @@ class Test_TC_OO_2_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_33(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_33(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_33() { NextTest(); } @@ -20929,11 +21275,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_34, - OnFailureCallback_34); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_34, OnFailureCallback_34)); + return CHIP_NO_ERROR; } - void OnFailureResponse_34(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_34(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_34(bool onOff) { @@ -20948,11 +21295,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_35, - OnFailureCallback_35); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_35, OnFailureCallback_35)); + return CHIP_NO_ERROR; } - void OnFailureResponse_35(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_35(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_35(uint16_t onTime) { @@ -20967,11 +21315,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_36, - OnFailureCallback_36); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_36, OnFailureCallback_36)); + return CHIP_NO_ERROR; } - void OnFailureResponse_36(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_36(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_36(uint16_t offWaitTime) { @@ -20999,7 +21348,7 @@ class Test_TC_OO_2_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_37(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_37(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_37() { NextTest(); } @@ -21009,11 +21358,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_38, - OnFailureCallback_38); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_38, OnFailureCallback_38)); + return CHIP_NO_ERROR; } - void OnFailureResponse_38(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_38(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_38(bool onOff) { @@ -21028,11 +21378,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_39, - OnFailureCallback_39); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_39, OnFailureCallback_39)); + return CHIP_NO_ERROR; } - void OnFailureResponse_39(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_39(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_39(uint16_t onTime) { @@ -21047,11 +21398,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_40, - OnFailureCallback_40); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_40, OnFailureCallback_40)); + return CHIP_NO_ERROR; } - void OnFailureResponse_40(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_40(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_40(bool onOff) { @@ -21066,11 +21418,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_41, - OnFailureCallback_41); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_41, OnFailureCallback_41)); + return CHIP_NO_ERROR; } - void OnFailureResponse_41(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_41(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_41(uint16_t onTime) { @@ -21085,11 +21438,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_42, - OnFailureCallback_42); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_42, OnFailureCallback_42)); + return CHIP_NO_ERROR; } - void OnFailureResponse_42(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_42(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_42(uint16_t offWaitTime) { @@ -21104,11 +21458,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_43, - OnFailureCallback_43); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_43, OnFailureCallback_43)); + return CHIP_NO_ERROR; } - void OnFailureResponse_43(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_43(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_43(bool onOff) { @@ -21123,11 +21478,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_44, - OnFailureCallback_44); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_44, OnFailureCallback_44)); + return CHIP_NO_ERROR; } - void OnFailureResponse_44(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_44(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_44(uint16_t onTime) { @@ -21142,11 +21498,12 @@ class Test_TC_OO_2_3 : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_45, - OnFailureCallback_45); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_45, OnFailureCallback_45)); + return CHIP_NO_ERROR; } - void OnFailureResponse_45(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_45(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_45(uint16_t offWaitTime) { @@ -21174,7 +21531,7 @@ class Test_TC_OO_2_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_46(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_46(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_46() { NextTest(); } }; @@ -21237,7 +21594,7 @@ class Test_TC_PRS_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t clusterRevision) @@ -21247,7 +21604,7 @@ class Test_TC_PRS_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context) { (static_cast(context))->OnSuccessResponse_2(); } @@ -21268,11 +21625,12 @@ class Test_TC_PRS_1_1 : public TestCommand chip::Controller::PressureMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t clusterRevision) { @@ -21296,7 +21654,7 @@ class Test_TC_PRS_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) + void OnFailureResponse_2(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -21390,7 +21748,7 @@ class Test_TC_PRS_2_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, int16_t measuredValue) @@ -21400,14 +21758,14 @@ class Test_TC_PRS_2_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context) { (static_cast(context))->OnSuccessResponse_2(); } static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, int16_t measuredValue) @@ -21417,7 +21775,7 @@ class Test_TC_PRS_2_1 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, int16_t minMeasuredValue) @@ -21427,14 +21785,14 @@ class Test_TC_PRS_2_1 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context) { (static_cast(context))->OnSuccessResponse_5(); } static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, int16_t minMeasuredValue) @@ -21444,7 +21802,7 @@ class Test_TC_PRS_2_1 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, int16_t maxMeasuredValue) @@ -21454,14 +21812,14 @@ class Test_TC_PRS_2_1 : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context) { (static_cast(context))->OnSuccessResponse_8(); } static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context, int16_t maxMeasuredValue) @@ -21485,11 +21843,12 @@ class Test_TC_PRS_2_1 : public TestCommand chip::Controller::PressureMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(int16_t measuredValue) { @@ -21512,7 +21871,7 @@ class Test_TC_PRS_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) + void OnFailureResponse_2(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -21526,11 +21885,12 @@ class Test_TC_PRS_2_1 : public TestCommand chip::Controller::PressureMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(int16_t measuredValue) { @@ -21545,11 +21905,13 @@ class Test_TC_PRS_2_1 : public TestCommand chip::Controller::PressureMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(int16_t minMeasuredValue) { @@ -21573,7 +21935,7 @@ class Test_TC_PRS_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) + void OnFailureResponse_5(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -21587,11 +21949,13 @@ class Test_TC_PRS_2_1 : public TestCommand chip::Controller::PressureMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_6, OnFailureCallback_6); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(int16_t minMeasuredValue) { @@ -21606,11 +21970,13 @@ class Test_TC_PRS_2_1 : public TestCommand chip::Controller::PressureMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_7, OnFailureCallback_7); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(int16_t maxMeasuredValue) { @@ -21634,7 +22000,7 @@ class Test_TC_PRS_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) + void OnFailureResponse_8(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -21648,11 +22014,13 @@ class Test_TC_PRS_2_1 : public TestCommand chip::Controller::PressureMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_9, OnFailureCallback_9); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_9, OnFailureCallback_9)); + return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9(int16_t maxMeasuredValue) { @@ -21724,7 +22092,7 @@ class Test_TC_PCC_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t clusterRevision) @@ -21734,14 +22102,14 @@ class Test_TC_PCC_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context) { (static_cast(context))->OnSuccessResponse_2(); } static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint32_t featureMap) @@ -21765,11 +22133,13 @@ class Test_TC_PCC_1_1 : public TestCommand chip::Controller::PumpConfigurationAndControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t clusterRevision) { @@ -21793,7 +22163,7 @@ class Test_TC_PCC_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) + void OnFailureResponse_2(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -21807,11 +22177,13 @@ class Test_TC_PCC_1_1 : public TestCommand chip::Controller::PumpConfigurationAndControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint32_t featureMap) { @@ -21902,7 +22274,7 @@ class Test_TC_PCC_2_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, int16_t maxPressure) @@ -21912,7 +22284,7 @@ class Test_TC_PCC_2_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint8_t effectiveOperationMode) @@ -21922,7 +22294,7 @@ class Test_TC_PCC_2_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint8_t effectiveControlMode) @@ -21932,7 +22304,7 @@ class Test_TC_PCC_2_1 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, int16_t capacity) @@ -21942,7 +22314,7 @@ class Test_TC_PCC_2_1 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, int16_t maxPressure) @@ -21952,7 +22324,7 @@ class Test_TC_PCC_2_1 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, uint8_t effectiveOperationMode) @@ -21962,7 +22334,7 @@ class Test_TC_PCC_2_1 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, uint8_t effectiveControlMode) @@ -21972,7 +22344,7 @@ class Test_TC_PCC_2_1 : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context, int16_t capacity) @@ -21996,11 +22368,13 @@ class Test_TC_PCC_2_1 : public TestCommand chip::Controller::PumpConfigurationAndControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(int16_t maxPressure) { @@ -22015,12 +22389,13 @@ class Test_TC_PCC_2_1 : public TestCommand chip::Controller::PumpConfigurationAndControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster - .ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint8_t effectiveOperationMode) { @@ -22035,11 +22410,13 @@ class Test_TC_PCC_2_1 : public TestCommand chip::Controller::PumpConfigurationAndControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint8_t effectiveControlMode) { @@ -22054,11 +22431,13 @@ class Test_TC_PCC_2_1 : public TestCommand chip::Controller::PumpConfigurationAndControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(int16_t capacity) { @@ -22073,11 +22452,13 @@ class Test_TC_PCC_2_1 : public TestCommand chip::Controller::PumpConfigurationAndControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_5, OnFailureCallback_5); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(int16_t maxPressure) { @@ -22092,12 +22473,13 @@ class Test_TC_PCC_2_1 : public TestCommand chip::Controller::PumpConfigurationAndControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster - .ReadAttribute( - this, OnSuccessCallback_6, OnFailureCallback_6); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(uint8_t effectiveOperationMode) { @@ -22112,11 +22494,13 @@ class Test_TC_PCC_2_1 : public TestCommand chip::Controller::PumpConfigurationAndControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_7, OnFailureCallback_7); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(uint8_t effectiveControlMode) { @@ -22131,11 +22515,13 @@ class Test_TC_PCC_2_1 : public TestCommand chip::Controller::PumpConfigurationAndControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_8, OnFailureCallback_8); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_8, OnFailureCallback_8)); + return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(int16_t capacity) { @@ -22206,21 +22592,21 @@ class Test_TC_PCC_2_2 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context) { (static_cast(context))->OnSuccessResponse_1(); } static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context) { (static_cast(context))->OnSuccessResponse_2(); } static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context) { (static_cast(context))->OnSuccessResponse_3(); } @@ -22250,7 +22636,7 @@ class Test_TC_PCC_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -22269,7 +22655,7 @@ class Test_TC_PCC_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2() { NextTest(); } @@ -22288,7 +22674,7 @@ class Test_TC_PCC_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } }; @@ -22350,14 +22736,14 @@ class Test_TC_PCC_2_3 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context) { (static_cast(context))->OnSuccessResponse_1(); } static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint8_t effectiveOperationMode) @@ -22390,7 +22776,7 @@ class Test_TC_PCC_2_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -22400,12 +22786,13 @@ class Test_TC_PCC_2_3 : public TestCommand chip::Controller::PumpConfigurationAndControlClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster - .ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint8_t effectiveOperationMode) { @@ -22473,7 +22860,7 @@ class Test_TC_RH_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t clusterRevision) @@ -22483,7 +22870,7 @@ class Test_TC_RH_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context) { (static_cast(context))->OnSuccessResponse_2(); } @@ -22504,11 +22891,13 @@ class Test_TC_RH_1_1 : public TestCommand chip::Controller::RelativeHumidityMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t clusterRevision) { @@ -22532,7 +22921,7 @@ class Test_TC_RH_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) + void OnFailureResponse_2(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -22598,7 +22987,7 @@ class Test_TC_RH_2_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t measuredValue) @@ -22608,7 +22997,7 @@ class Test_TC_RH_2_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint16_t minMeasuredValue) @@ -22632,11 +23021,13 @@ class Test_TC_RH_2_1 : public TestCommand chip::Controller::RelativeHumidityMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t measuredValue) { @@ -22651,11 +23042,13 @@ class Test_TC_RH_2_1 : public TestCommand chip::Controller::RelativeHumidityMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint16_t minMeasuredValue) { @@ -22723,7 +23116,7 @@ class Test_TC_RH_2_2 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t measuredValue) @@ -22733,7 +23126,7 @@ class Test_TC_RH_2_2 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint16_t measuredValue) @@ -22757,11 +23150,13 @@ class Test_TC_RH_2_2 : public TestCommand chip::Controller::RelativeHumidityMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t measuredValue) { @@ -22776,11 +23171,13 @@ class Test_TC_RH_2_2 : public TestCommand chip::Controller::RelativeHumidityMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint16_t measuredValue) { @@ -22856,7 +23253,7 @@ class Test_TC_TM_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t clusterRevision) @@ -22866,7 +23263,7 @@ class Test_TC_TM_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint16_t clusterRevision) @@ -22876,14 +23273,14 @@ class Test_TC_TM_1_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context) { (static_cast(context))->OnSuccessResponse_3(); } static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint16_t clusterRevision) @@ -22907,11 +23304,13 @@ class Test_TC_TM_1_1 : public TestCommand chip::Controller::TemperatureMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t clusterRevision) { @@ -22926,11 +23325,13 @@ class Test_TC_TM_1_1 : public TestCommand chip::Controller::TemperatureMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint16_t clusterRevision) { @@ -22954,7 +23355,7 @@ class Test_TC_TM_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) + void OnFailureResponse_3(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -22968,11 +23369,13 @@ class Test_TC_TM_1_1 : public TestCommand chip::Controller::TemperatureMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint16_t clusterRevision) { @@ -23035,7 +23438,7 @@ class Test_TC_TM_2_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, int16_t measuredValue) @@ -23059,11 +23462,13 @@ class Test_TC_TM_2_1 : public TestCommand chip::Controller::TemperatureMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(int16_t measuredValue) { @@ -23130,7 +23535,7 @@ class Test_TC_TM_2_2 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, int16_t measuredValue) @@ -23140,7 +23545,7 @@ class Test_TC_TM_2_2 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, int16_t measuredValue) @@ -23164,11 +23569,13 @@ class Test_TC_TM_2_2 : public TestCommand chip::Controller::TemperatureMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(int16_t measuredValue) { @@ -23183,11 +23590,13 @@ class Test_TC_TM_2_2 : public TestCommand chip::Controller::TemperatureMeasurementClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(int16_t measuredValue) { @@ -23259,7 +23668,7 @@ class Test_TC_TSTAT_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t clusterRevision) @@ -23269,14 +23678,14 @@ class Test_TC_TSTAT_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context) { (static_cast(context))->OnSuccessResponse_2(); } static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint32_t featureMap) @@ -23300,11 +23709,12 @@ class Test_TC_TSTAT_1_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t clusterRevision) { @@ -23327,7 +23737,7 @@ class Test_TC_TSTAT_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) + void OnFailureResponse_2(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -23341,11 +23751,12 @@ class Test_TC_TSTAT_1_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_3, - OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint32_t featureMap) { @@ -23690,7 +24101,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, int16_t localTemperature) @@ -23700,7 +24111,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, int16_t absMinHeatSetpointLimit) @@ -23710,7 +24121,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, int16_t absMinHeatSetpointLimit) @@ -23720,14 +24131,14 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context) { (static_cast(context))->OnSuccessResponse_4(); } static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, int16_t absMinHeatSetpointLimit) @@ -23737,7 +24148,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, int16_t absMaxHeatSetpointLimit) @@ -23747,7 +24158,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, int16_t absMaxHeatSetpointLimit) @@ -23757,14 +24168,14 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context) { (static_cast(context))->OnSuccessResponse_8(); } static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context, int16_t absMaxHeatSetpointLimit) @@ -23774,7 +24185,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_10(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_10(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_10(status); } static void OnSuccessCallback_10(void * context, int16_t absMinCoolSetpointLimit) @@ -23784,7 +24195,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_11(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_11(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_11(status); } static void OnSuccessCallback_11(void * context, int16_t absMinCoolSetpointLimit) @@ -23794,14 +24205,14 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_12(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_12(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_12(status); } static void OnSuccessCallback_12(void * context) { (static_cast(context))->OnSuccessResponse_12(); } static void OnFailureCallback_13(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_13(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_13(status); } static void OnSuccessCallback_13(void * context, int16_t absMinCoolSetpointLimit) @@ -23811,7 +24222,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_14(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_14(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_14(status); } static void OnSuccessCallback_14(void * context, int16_t absMaxCoolSetpointLimit) @@ -23821,7 +24232,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_15(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_15(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_15(status); } static void OnSuccessCallback_15(void * context, int16_t absMaxCoolSetpointLimit) @@ -23831,14 +24242,14 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_16(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_16(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_16(status); } static void OnSuccessCallback_16(void * context) { (static_cast(context))->OnSuccessResponse_16(); } static void OnFailureCallback_17(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_17(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_17(status); } static void OnSuccessCallback_17(void * context, int16_t absMaxCoolSetpointLimit) @@ -23848,7 +24259,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_18(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_18(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_18(status); } static void OnSuccessCallback_18(void * context, int16_t occupiedCoolingSetpoint) @@ -23858,7 +24269,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_19(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_19(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_19(status); } static void OnSuccessCallback_19(void * context, int16_t occupiedCoolingSetpoint) @@ -23868,14 +24279,14 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_20(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_20(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_20(status); } static void OnSuccessCallback_20(void * context) { (static_cast(context))->OnSuccessResponse_20(); } static void OnFailureCallback_21(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_21(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_21(status); } static void OnSuccessCallback_21(void * context, int16_t occupiedCoolingSetpoint) @@ -23885,7 +24296,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_22(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_22(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_22(status); } static void OnSuccessCallback_22(void * context, int16_t occupiedHeatingSetpoint) @@ -23895,7 +24306,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_23(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_23(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_23(status); } static void OnSuccessCallback_23(void * context, int16_t occupiedHeatingSetpoint) @@ -23905,14 +24316,14 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_24(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_24(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_24(status); } static void OnSuccessCallback_24(void * context) { (static_cast(context))->OnSuccessResponse_24(); } static void OnFailureCallback_25(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_25(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_25(status); } static void OnSuccessCallback_25(void * context, int16_t occupiedHeatingSetpoint) @@ -23922,7 +24333,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_26(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_26(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_26(status); } static void OnSuccessCallback_26(void * context, int16_t minHeatSetpointLimit) @@ -23932,7 +24343,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_27(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_27(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_27(status); } static void OnSuccessCallback_27(void * context, int16_t minHeatSetpointLimit) @@ -23942,14 +24353,14 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_28(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_28(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_28(status); } static void OnSuccessCallback_28(void * context) { (static_cast(context))->OnSuccessResponse_28(); } static void OnFailureCallback_29(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_29(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_29(status); } static void OnSuccessCallback_29(void * context, int16_t minHeatSetpointLimit) @@ -23959,7 +24370,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_30(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_30(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_30(status); } static void OnSuccessCallback_30(void * context, int16_t maxHeatSetpointLimit) @@ -23969,7 +24380,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_31(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_31(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_31(status); } static void OnSuccessCallback_31(void * context, int16_t maxHeatSetpointLimit) @@ -23979,14 +24390,14 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_32(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_32(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_32(status); } static void OnSuccessCallback_32(void * context) { (static_cast(context))->OnSuccessResponse_32(); } static void OnFailureCallback_33(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_33(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_33(status); } static void OnSuccessCallback_33(void * context, int16_t maxHeatSetpointLimit) @@ -23996,7 +24407,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_34(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_34(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_34(status); } static void OnSuccessCallback_34(void * context, int16_t minCoolSetpointLimit) @@ -24006,7 +24417,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_35(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_35(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_35(status); } static void OnSuccessCallback_35(void * context, int16_t minCoolSetpointLimit) @@ -24016,14 +24427,14 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_36(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_36(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_36(status); } static void OnSuccessCallback_36(void * context) { (static_cast(context))->OnSuccessResponse_36(); } static void OnFailureCallback_37(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_37(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_37(status); } static void OnSuccessCallback_37(void * context, int16_t minCoolSetpointLimit) @@ -24033,7 +24444,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_38(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_38(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_38(status); } static void OnSuccessCallback_38(void * context, int16_t maxCoolSetpointLimit) @@ -24043,7 +24454,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_39(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_39(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_39(status); } static void OnSuccessCallback_39(void * context, int16_t maxCoolSetpointLimit) @@ -24053,14 +24464,14 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_40(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_40(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_40(status); } static void OnSuccessCallback_40(void * context) { (static_cast(context))->OnSuccessResponse_40(); } static void OnFailureCallback_41(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_41(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_41(status); } static void OnSuccessCallback_41(void * context, int16_t maxCoolSetpointLimit) @@ -24070,7 +24481,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_42(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_42(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_42(status); } static void OnSuccessCallback_42(void * context, uint8_t controlSequenceOfOperation) @@ -24080,7 +24491,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_43(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_43(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_43(status); } static void OnSuccessCallback_43(void * context, uint8_t controlSequenceOfOperation) @@ -24090,14 +24501,14 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_44(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_44(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_44(status); } static void OnSuccessCallback_44(void * context) { (static_cast(context))->OnSuccessResponse_44(); } static void OnFailureCallback_45(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_45(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_45(status); } static void OnSuccessCallback_45(void * context, uint8_t controlSequenceOfOperation) @@ -24107,7 +24518,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_46(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_46(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_46(status); } static void OnSuccessCallback_46(void * context, uint8_t systemMode) @@ -24117,7 +24528,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_47(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_47(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_47(status); } static void OnSuccessCallback_47(void * context, uint8_t systemMode) @@ -24127,14 +24538,14 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_48(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_48(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_48(status); } static void OnSuccessCallback_48(void * context) { (static_cast(context))->OnSuccessResponse_48(); } static void OnFailureCallback_49(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_49(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_49(status); } static void OnSuccessCallback_49(void * context, uint8_t systemMode) @@ -24144,7 +24555,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_50(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_50(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_50(status); } static void OnSuccessCallback_50(void * context, int8_t minSetpointDeadBand) @@ -24154,7 +24565,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_51(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_51(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_51(status); } static void OnSuccessCallback_51(void * context, int8_t minSetpointDeadBand) @@ -24164,14 +24575,14 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_52(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_52(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_52(status); } static void OnSuccessCallback_52(void * context) { (static_cast(context))->OnSuccessResponse_52(); } static void OnFailureCallback_53(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_53(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_53(status); } static void OnSuccessCallback_53(void * context, int8_t minSetpointDeadBand) @@ -24181,7 +24592,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_54(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_54(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_54(status); } static void OnSuccessCallback_54(void * context, uint8_t startOfWeek) @@ -24191,14 +24602,14 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_55(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_55(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_55(status); } static void OnSuccessCallback_55(void * context) { (static_cast(context))->OnSuccessResponse_55(); } static void OnFailureCallback_56(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_56(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_56(status); } static void OnSuccessCallback_56(void * context, uint8_t startOfWeek) @@ -24208,7 +24619,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_57(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_57(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_57(status); } static void OnSuccessCallback_57(void * context, uint8_t numberOfWeeklyTransitions) @@ -24218,14 +24629,14 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_58(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_58(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_58(status); } static void OnSuccessCallback_58(void * context) { (static_cast(context))->OnSuccessResponse_58(); } static void OnFailureCallback_59(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_59(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_59(status); } static void OnSuccessCallback_59(void * context, uint8_t numberOfDailyTransitions) @@ -24235,7 +24646,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand static void OnFailureCallback_60(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_60(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_60(status); } static void OnSuccessCallback_60(void * context) { (static_cast(context))->OnSuccessResponse_60(); } @@ -24256,11 +24667,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(int16_t localTemperature) { @@ -24275,11 +24687,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(int16_t absMinHeatSetpointLimit) { @@ -24294,11 +24707,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(int16_t absMinHeatSetpointLimit) { @@ -24323,7 +24737,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) + void OnFailureResponse_4(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -24337,11 +24751,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_5, OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(int16_t absMinHeatSetpointLimit) { @@ -24356,11 +24771,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_6, OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(int16_t absMaxHeatSetpointLimit) { @@ -24375,11 +24791,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_7, OnFailureCallback_7); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(int16_t absMaxHeatSetpointLimit) { @@ -24404,7 +24821,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) + void OnFailureResponse_8(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -24418,11 +24835,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_9, OnFailureCallback_9); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_9, OnFailureCallback_9)); + return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9(int16_t absMaxHeatSetpointLimit) { @@ -24437,11 +24855,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_10, OnFailureCallback_10); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_10, OnFailureCallback_10)); + return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10(int16_t absMinCoolSetpointLimit) { @@ -24456,11 +24875,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_11, OnFailureCallback_11); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_11, OnFailureCallback_11)); + return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11(int16_t absMinCoolSetpointLimit) { @@ -24485,7 +24905,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) + void OnFailureResponse_12(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -24499,11 +24919,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_13, OnFailureCallback_13); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_13, OnFailureCallback_13)); + return CHIP_NO_ERROR; } - void OnFailureResponse_13(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_13(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_13(int16_t absMinCoolSetpointLimit) { @@ -24518,11 +24939,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_14, OnFailureCallback_14); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_14, OnFailureCallback_14)); + return CHIP_NO_ERROR; } - void OnFailureResponse_14(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_14(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_14(int16_t absMaxCoolSetpointLimit) { @@ -24537,11 +24959,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_15, OnFailureCallback_15); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_15, OnFailureCallback_15)); + return CHIP_NO_ERROR; } - void OnFailureResponse_15(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_15(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_15(int16_t absMaxCoolSetpointLimit) { @@ -24566,7 +24989,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_16(uint8_t status) + void OnFailureResponse_16(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -24580,11 +25003,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_17, OnFailureCallback_17); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_17, OnFailureCallback_17)); + return CHIP_NO_ERROR; } - void OnFailureResponse_17(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_17(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_17(int16_t absMaxCoolSetpointLimit) { @@ -24599,11 +25023,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_18, OnFailureCallback_18); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_18, OnFailureCallback_18)); + return CHIP_NO_ERROR; } - void OnFailureResponse_18(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_18(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_18(int16_t occupiedCoolingSetpoint) { @@ -24618,11 +25043,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_19, OnFailureCallback_19); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_19, OnFailureCallback_19)); + return CHIP_NO_ERROR; } - void OnFailureResponse_19(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_19(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_19(int16_t occupiedCoolingSetpoint) { @@ -24647,7 +25073,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_20(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_20(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_20() { NextTest(); } @@ -24657,11 +25083,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_21, OnFailureCallback_21); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_21, OnFailureCallback_21)); + return CHIP_NO_ERROR; } - void OnFailureResponse_21(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_21(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_21(int16_t occupiedCoolingSetpoint) { @@ -24676,11 +25103,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_22, OnFailureCallback_22); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_22, OnFailureCallback_22)); + return CHIP_NO_ERROR; } - void OnFailureResponse_22(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_22(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_22(int16_t occupiedHeatingSetpoint) { @@ -24695,11 +25123,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_23, OnFailureCallback_23); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_23, OnFailureCallback_23)); + return CHIP_NO_ERROR; } - void OnFailureResponse_23(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_23(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_23(int16_t occupiedHeatingSetpoint) { @@ -24724,7 +25153,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_24(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_24(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_24() { NextTest(); } @@ -24734,11 +25163,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_25, OnFailureCallback_25); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_25, OnFailureCallback_25)); + return CHIP_NO_ERROR; } - void OnFailureResponse_25(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_25(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_25(int16_t occupiedHeatingSetpoint) { @@ -24753,11 +25183,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_26, OnFailureCallback_26); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_26, OnFailureCallback_26)); + return CHIP_NO_ERROR; } - void OnFailureResponse_26(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_26(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_26(int16_t minHeatSetpointLimit) { @@ -24772,11 +25203,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_27, OnFailureCallback_27); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_27, OnFailureCallback_27)); + return CHIP_NO_ERROR; } - void OnFailureResponse_27(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_27(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_27(int16_t minHeatSetpointLimit) { @@ -24801,7 +25233,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_28(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_28(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_28() { NextTest(); } @@ -24811,11 +25243,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_29, OnFailureCallback_29); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_29, OnFailureCallback_29)); + return CHIP_NO_ERROR; } - void OnFailureResponse_29(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_29(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_29(int16_t minHeatSetpointLimit) { @@ -24830,11 +25263,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_30, OnFailureCallback_30); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_30, OnFailureCallback_30)); + return CHIP_NO_ERROR; } - void OnFailureResponse_30(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_30(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_30(int16_t maxHeatSetpointLimit) { @@ -24849,11 +25283,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_31, OnFailureCallback_31); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_31, OnFailureCallback_31)); + return CHIP_NO_ERROR; } - void OnFailureResponse_31(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_31(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_31(int16_t maxHeatSetpointLimit) { @@ -24878,7 +25313,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_32(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_32(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_32() { NextTest(); } @@ -24888,11 +25323,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_33, OnFailureCallback_33); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_33, OnFailureCallback_33)); + return CHIP_NO_ERROR; } - void OnFailureResponse_33(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_33(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_33(int16_t maxHeatSetpointLimit) { @@ -24907,11 +25343,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_34, OnFailureCallback_34); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_34, OnFailureCallback_34)); + return CHIP_NO_ERROR; } - void OnFailureResponse_34(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_34(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_34(int16_t minCoolSetpointLimit) { @@ -24926,11 +25363,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_35, OnFailureCallback_35); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_35, OnFailureCallback_35)); + return CHIP_NO_ERROR; } - void OnFailureResponse_35(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_35(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_35(int16_t minCoolSetpointLimit) { @@ -24955,7 +25393,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_36(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_36(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_36() { NextTest(); } @@ -24965,11 +25403,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_37, OnFailureCallback_37); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_37, OnFailureCallback_37)); + return CHIP_NO_ERROR; } - void OnFailureResponse_37(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_37(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_37(int16_t minCoolSetpointLimit) { @@ -24984,11 +25423,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_38, OnFailureCallback_38); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_38, OnFailureCallback_38)); + return CHIP_NO_ERROR; } - void OnFailureResponse_38(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_38(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_38(int16_t maxCoolSetpointLimit) { @@ -25003,11 +25443,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_39, OnFailureCallback_39); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_39, OnFailureCallback_39)); + return CHIP_NO_ERROR; } - void OnFailureResponse_39(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_39(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_39(int16_t maxCoolSetpointLimit) { @@ -25032,7 +25473,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_40(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_40(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_40() { NextTest(); } @@ -25042,11 +25483,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_41, OnFailureCallback_41); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_41, OnFailureCallback_41)); + return CHIP_NO_ERROR; } - void OnFailureResponse_41(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_41(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_41(int16_t maxCoolSetpointLimit) { @@ -25061,11 +25503,13 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_42, OnFailureCallback_42); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_42, OnFailureCallback_42)); + return CHIP_NO_ERROR; } - void OnFailureResponse_42(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_42(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_42(uint8_t controlSequenceOfOperation) { @@ -25080,11 +25524,13 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_43, OnFailureCallback_43); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_43, OnFailureCallback_43)); + return CHIP_NO_ERROR; } - void OnFailureResponse_43(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_43(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_43(uint8_t controlSequenceOfOperation) { @@ -25109,7 +25555,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_44(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_44(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_44() { NextTest(); } @@ -25119,11 +25565,13 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_45, OnFailureCallback_45); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_45, OnFailureCallback_45)); + return CHIP_NO_ERROR; } - void OnFailureResponse_45(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_45(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_45(uint8_t controlSequenceOfOperation) { @@ -25138,11 +25586,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_46, - OnFailureCallback_46); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_46, OnFailureCallback_46)); + return CHIP_NO_ERROR; } - void OnFailureResponse_46(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_46(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_46(uint8_t systemMode) { @@ -25157,11 +25606,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_47, - OnFailureCallback_47); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_47, OnFailureCallback_47)); + return CHIP_NO_ERROR; } - void OnFailureResponse_47(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_47(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_47(uint8_t systemMode) { @@ -25185,7 +25635,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_48(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_48(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_48() { NextTest(); } @@ -25195,11 +25645,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_49, - OnFailureCallback_49); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_49, OnFailureCallback_49)); + return CHIP_NO_ERROR; } - void OnFailureResponse_49(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_49(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_49(uint8_t systemMode) { @@ -25214,11 +25665,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_50, OnFailureCallback_50); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_50, OnFailureCallback_50)); + return CHIP_NO_ERROR; } - void OnFailureResponse_50(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_50(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_50(int8_t minSetpointDeadBand) { @@ -25233,11 +25685,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_51, OnFailureCallback_51); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_51, OnFailureCallback_51)); + return CHIP_NO_ERROR; } - void OnFailureResponse_51(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_51(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_51(int8_t minSetpointDeadBand) { @@ -25261,7 +25714,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_52(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_52(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_52() { NextTest(); } @@ -25271,11 +25724,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_53, OnFailureCallback_53); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_53, OnFailureCallback_53)); + return CHIP_NO_ERROR; } - void OnFailureResponse_53(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_53(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_53(int8_t minSetpointDeadBand) { @@ -25290,11 +25744,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_54, - OnFailureCallback_54); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_54, OnFailureCallback_54)); + return CHIP_NO_ERROR; } - void OnFailureResponse_54(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_54(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_54(uint8_t startOfWeek) { @@ -25318,7 +25773,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_55(uint8_t status) + void OnFailureResponse_55(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -25332,11 +25787,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_56, - OnFailureCallback_56); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_56, OnFailureCallback_56)); + return CHIP_NO_ERROR; } - void OnFailureResponse_56(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_56(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_56(uint8_t startOfWeek) { @@ -25351,11 +25807,13 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_57, OnFailureCallback_57); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_57, OnFailureCallback_57)); + return CHIP_NO_ERROR; } - void OnFailureResponse_57(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_57(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_57(uint8_t numberOfWeeklyTransitions) { @@ -25379,7 +25837,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_58(uint8_t status) + void OnFailureResponse_58(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -25393,11 +25851,12 @@ class Test_TC_TSTAT_2_1 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_59, OnFailureCallback_59); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_59, OnFailureCallback_59)); + return CHIP_NO_ERROR; } - void OnFailureResponse_59(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_59(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_59(uint8_t numberOfDailyTransitions) { @@ -25421,7 +25880,7 @@ class Test_TC_TSTAT_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_60(uint8_t status) + void OnFailureResponse_60(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -25822,7 +26281,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, int16_t occupiedCoolingSetpoint) @@ -25832,14 +26291,14 @@ class Test_TC_TSTAT_2_2 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context) { (static_cast(context))->OnSuccessResponse_2(); } static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, int16_t occupiedCoolingSetpoint) @@ -25849,21 +26308,21 @@ class Test_TC_TSTAT_2_2 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context) { (static_cast(context))->OnSuccessResponse_4(); } static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context) { (static_cast(context))->OnSuccessResponse_5(); } static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, int16_t occupiedHeatingSetpoint) @@ -25873,14 +26332,14 @@ class Test_TC_TSTAT_2_2 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context) { (static_cast(context))->OnSuccessResponse_7(); } static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context, int16_t occupiedHeatingSetpoint) @@ -25890,21 +26349,21 @@ class Test_TC_TSTAT_2_2 : public TestCommand static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context) { (static_cast(context))->OnSuccessResponse_9(); } static void OnFailureCallback_10(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_10(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_10(status); } static void OnSuccessCallback_10(void * context) { (static_cast(context))->OnSuccessResponse_10(); } static void OnFailureCallback_11(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_11(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_11(status); } static void OnSuccessCallback_11(void * context, int16_t minHeatSetpointLimit) @@ -25914,14 +26373,14 @@ class Test_TC_TSTAT_2_2 : public TestCommand static void OnFailureCallback_12(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_12(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_12(status); } static void OnSuccessCallback_12(void * context) { (static_cast(context))->OnSuccessResponse_12(); } static void OnFailureCallback_13(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_13(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_13(status); } static void OnSuccessCallback_13(void * context, int16_t minHeatSetpointLimit) @@ -25931,21 +26390,21 @@ class Test_TC_TSTAT_2_2 : public TestCommand static void OnFailureCallback_14(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_14(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_14(status); } static void OnSuccessCallback_14(void * context) { (static_cast(context))->OnSuccessResponse_14(); } static void OnFailureCallback_15(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_15(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_15(status); } static void OnSuccessCallback_15(void * context) { (static_cast(context))->OnSuccessResponse_15(); } static void OnFailureCallback_16(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_16(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_16(status); } static void OnSuccessCallback_16(void * context, int16_t maxHeatSetpointLimit) @@ -25955,14 +26414,14 @@ class Test_TC_TSTAT_2_2 : public TestCommand static void OnFailureCallback_17(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_17(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_17(status); } static void OnSuccessCallback_17(void * context) { (static_cast(context))->OnSuccessResponse_17(); } static void OnFailureCallback_18(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_18(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_18(status); } static void OnSuccessCallback_18(void * context, int16_t maxHeatSetpointLimit) @@ -25972,21 +26431,21 @@ class Test_TC_TSTAT_2_2 : public TestCommand static void OnFailureCallback_19(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_19(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_19(status); } static void OnSuccessCallback_19(void * context) { (static_cast(context))->OnSuccessResponse_19(); } static void OnFailureCallback_20(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_20(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_20(status); } static void OnSuccessCallback_20(void * context) { (static_cast(context))->OnSuccessResponse_20(); } static void OnFailureCallback_21(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_21(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_21(status); } static void OnSuccessCallback_21(void * context, int16_t minCoolSetpointLimit) @@ -25996,14 +26455,14 @@ class Test_TC_TSTAT_2_2 : public TestCommand static void OnFailureCallback_22(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_22(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_22(status); } static void OnSuccessCallback_22(void * context) { (static_cast(context))->OnSuccessResponse_22(); } static void OnFailureCallback_23(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_23(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_23(status); } static void OnSuccessCallback_23(void * context, int16_t minCoolSetpointLimit) @@ -26013,21 +26472,21 @@ class Test_TC_TSTAT_2_2 : public TestCommand static void OnFailureCallback_24(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_24(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_24(status); } static void OnSuccessCallback_24(void * context) { (static_cast(context))->OnSuccessResponse_24(); } static void OnFailureCallback_25(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_25(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_25(status); } static void OnSuccessCallback_25(void * context) { (static_cast(context))->OnSuccessResponse_25(); } static void OnFailureCallback_26(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_26(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_26(status); } static void OnSuccessCallback_26(void * context, int16_t maxCoolSetpointLimit) @@ -26037,14 +26496,14 @@ class Test_TC_TSTAT_2_2 : public TestCommand static void OnFailureCallback_27(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_27(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_27(status); } static void OnSuccessCallback_27(void * context) { (static_cast(context))->OnSuccessResponse_27(); } static void OnFailureCallback_28(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_28(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_28(status); } static void OnSuccessCallback_28(void * context, int16_t maxCoolSetpointLimit) @@ -26054,77 +26513,77 @@ class Test_TC_TSTAT_2_2 : public TestCommand static void OnFailureCallback_29(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_29(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_29(status); } static void OnSuccessCallback_29(void * context) { (static_cast(context))->OnSuccessResponse_29(); } static void OnFailureCallback_30(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_30(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_30(status); } static void OnSuccessCallback_30(void * context) { (static_cast(context))->OnSuccessResponse_30(); } static void OnFailureCallback_31(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_31(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_31(status); } static void OnSuccessCallback_31(void * context) { (static_cast(context))->OnSuccessResponse_31(); } static void OnFailureCallback_32(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_32(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_32(status); } static void OnSuccessCallback_32(void * context) { (static_cast(context))->OnSuccessResponse_32(); } static void OnFailureCallback_33(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_33(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_33(status); } static void OnSuccessCallback_33(void * context) { (static_cast(context))->OnSuccessResponse_33(); } static void OnFailureCallback_34(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_34(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_34(status); } static void OnSuccessCallback_34(void * context) { (static_cast(context))->OnSuccessResponse_34(); } static void OnFailureCallback_35(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_35(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_35(status); } static void OnSuccessCallback_35(void * context) { (static_cast(context))->OnSuccessResponse_35(); } static void OnFailureCallback_36(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_36(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_36(status); } static void OnSuccessCallback_36(void * context) { (static_cast(context))->OnSuccessResponse_36(); } static void OnFailureCallback_37(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_37(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_37(status); } static void OnSuccessCallback_37(void * context) { (static_cast(context))->OnSuccessResponse_37(); } static void OnFailureCallback_38(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_38(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_38(status); } static void OnSuccessCallback_38(void * context) { (static_cast(context))->OnSuccessResponse_38(); } static void OnFailureCallback_39(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_39(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_39(status); } static void OnSuccessCallback_39(void * context, uint8_t controlSequenceOfOperation) @@ -26134,14 +26593,14 @@ class Test_TC_TSTAT_2_2 : public TestCommand static void OnFailureCallback_40(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_40(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_40(status); } static void OnSuccessCallback_40(void * context) { (static_cast(context))->OnSuccessResponse_40(); } static void OnFailureCallback_41(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_41(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_41(status); } static void OnSuccessCallback_41(void * context, uint8_t controlSequenceOfOperation) @@ -26151,56 +26610,56 @@ class Test_TC_TSTAT_2_2 : public TestCommand static void OnFailureCallback_42(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_42(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_42(status); } static void OnSuccessCallback_42(void * context) { (static_cast(context))->OnSuccessResponse_42(); } static void OnFailureCallback_43(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_43(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_43(status); } static void OnSuccessCallback_43(void * context) { (static_cast(context))->OnSuccessResponse_43(); } static void OnFailureCallback_44(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_44(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_44(status); } static void OnSuccessCallback_44(void * context) { (static_cast(context))->OnSuccessResponse_44(); } static void OnFailureCallback_45(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_45(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_45(status); } static void OnSuccessCallback_45(void * context) { (static_cast(context))->OnSuccessResponse_45(); } static void OnFailureCallback_46(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_46(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_46(status); } static void OnSuccessCallback_46(void * context) { (static_cast(context))->OnSuccessResponse_46(); } static void OnFailureCallback_47(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_47(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_47(status); } static void OnSuccessCallback_47(void * context) { (static_cast(context))->OnSuccessResponse_47(); } static void OnFailureCallback_48(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_48(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_48(status); } static void OnSuccessCallback_48(void * context) { (static_cast(context))->OnSuccessResponse_48(); } static void OnFailureCallback_49(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_49(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_49(status); } static void OnSuccessCallback_49(void * context) { (static_cast(context))->OnSuccessResponse_49(); } @@ -26221,11 +26680,12 @@ class Test_TC_TSTAT_2_2 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(int16_t occupiedCoolingSetpoint) { @@ -26248,7 +26708,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2() { NextTest(); } @@ -26258,11 +26718,12 @@ class Test_TC_TSTAT_2_2 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(int16_t occupiedCoolingSetpoint) { @@ -26285,7 +26746,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -26303,7 +26764,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -26313,11 +26774,12 @@ class Test_TC_TSTAT_2_2 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_6, OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(int16_t occupiedHeatingSetpoint) { @@ -26340,7 +26802,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7() { NextTest(); } @@ -26350,11 +26812,12 @@ class Test_TC_TSTAT_2_2 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_8, OnFailureCallback_8); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_8, OnFailureCallback_8)); + return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(int16_t occupiedHeatingSetpoint) { @@ -26377,7 +26840,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9() { NextTest(); } @@ -26395,7 +26858,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10() { NextTest(); } @@ -26405,11 +26868,12 @@ class Test_TC_TSTAT_2_2 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_11, OnFailureCallback_11); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_11, OnFailureCallback_11)); + return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11(int16_t minHeatSetpointLimit) { @@ -26432,7 +26896,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_12(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_12() { NextTest(); } @@ -26442,11 +26906,12 @@ class Test_TC_TSTAT_2_2 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_13, OnFailureCallback_13); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_13, OnFailureCallback_13)); + return CHIP_NO_ERROR; } - void OnFailureResponse_13(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_13(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_13(int16_t minHeatSetpointLimit) { @@ -26469,7 +26934,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_14(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_14(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_14() { NextTest(); } @@ -26487,7 +26952,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_15(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_15(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_15() { NextTest(); } @@ -26497,11 +26962,12 @@ class Test_TC_TSTAT_2_2 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_16, OnFailureCallback_16); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_16, OnFailureCallback_16)); + return CHIP_NO_ERROR; } - void OnFailureResponse_16(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_16(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_16(int16_t maxHeatSetpointLimit) { @@ -26524,7 +26990,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_17(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_17(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_17() { NextTest(); } @@ -26534,11 +27000,12 @@ class Test_TC_TSTAT_2_2 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_18, OnFailureCallback_18); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_18, OnFailureCallback_18)); + return CHIP_NO_ERROR; } - void OnFailureResponse_18(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_18(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_18(int16_t maxHeatSetpointLimit) { @@ -26561,7 +27028,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_19(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_19(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_19() { NextTest(); } @@ -26579,7 +27046,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_20(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_20(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_20() { NextTest(); } @@ -26589,11 +27056,12 @@ class Test_TC_TSTAT_2_2 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_21, OnFailureCallback_21); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_21, OnFailureCallback_21)); + return CHIP_NO_ERROR; } - void OnFailureResponse_21(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_21(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_21(int16_t minCoolSetpointLimit) { @@ -26616,7 +27084,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_22(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_22(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_22() { NextTest(); } @@ -26626,11 +27094,12 @@ class Test_TC_TSTAT_2_2 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_23, OnFailureCallback_23); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_23, OnFailureCallback_23)); + return CHIP_NO_ERROR; } - void OnFailureResponse_23(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_23(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_23(int16_t minCoolSetpointLimit) { @@ -26653,7 +27122,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_24(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_24(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_24() { NextTest(); } @@ -26671,7 +27140,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_25(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_25(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_25() { NextTest(); } @@ -26681,11 +27150,12 @@ class Test_TC_TSTAT_2_2 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_26, OnFailureCallback_26); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_26, OnFailureCallback_26)); + return CHIP_NO_ERROR; } - void OnFailureResponse_26(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_26(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_26(int16_t maxCoolSetpointLimit) { @@ -26708,7 +27178,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_27(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_27(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_27() { NextTest(); } @@ -26718,11 +27188,12 @@ class Test_TC_TSTAT_2_2 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_28, OnFailureCallback_28); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_28, OnFailureCallback_28)); + return CHIP_NO_ERROR; } - void OnFailureResponse_28(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_28(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_28(int16_t maxCoolSetpointLimit) { @@ -26745,7 +27216,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_29(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_29(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_29() { NextTest(); } @@ -26763,7 +27234,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_30(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_30(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_30() { NextTest(); } @@ -26781,7 +27252,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_31(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_31(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_31() { NextTest(); } @@ -26799,7 +27270,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_32(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_32(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_32() { NextTest(); } @@ -26817,7 +27288,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_33(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_33(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_33() { NextTest(); } @@ -26835,7 +27306,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_34(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_34(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_34() { NextTest(); } @@ -26853,7 +27324,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_35(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_35(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_35() { NextTest(); } @@ -26871,7 +27342,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_36(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_36(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_36() { NextTest(); } @@ -26889,7 +27360,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_37(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_37(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_37() { NextTest(); } @@ -26907,7 +27378,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_38(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_38(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_38() { NextTest(); } @@ -26917,11 +27388,13 @@ class Test_TC_TSTAT_2_2 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_39, OnFailureCallback_39); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_39, OnFailureCallback_39)); + return CHIP_NO_ERROR; } - void OnFailureResponse_39(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_39(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_39(uint8_t controlSequenceOfOperation) { @@ -26945,7 +27418,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_40(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_40(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_40() { NextTest(); } @@ -26955,11 +27428,13 @@ class Test_TC_TSTAT_2_2 : public TestCommand chip::Controller::ThermostatClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_41, OnFailureCallback_41); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_41, OnFailureCallback_41)); + return CHIP_NO_ERROR; } - void OnFailureResponse_41(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_41(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_41(uint8_t controlSequenceOfOperation) { @@ -26982,7 +27457,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_42(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_42(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_42() { NextTest(); } @@ -27000,7 +27475,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_43(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_43(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_43() { NextTest(); } @@ -27018,7 +27493,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_44(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_44(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_44() { NextTest(); } @@ -27036,7 +27511,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_45(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_45(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_45() { NextTest(); } @@ -27054,7 +27529,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_46(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_46(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_46() { NextTest(); } @@ -27072,7 +27547,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_47(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_47(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_47() { NextTest(); } @@ -27090,7 +27565,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_48(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_48(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_48() { NextTest(); } @@ -27108,7 +27583,7 @@ class Test_TC_TSTAT_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_49(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_49(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_49() { NextTest(); } }; @@ -27171,7 +27646,7 @@ class Test_TC_TSUIC_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t clusterRevision) @@ -27181,7 +27656,7 @@ class Test_TC_TSUIC_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context) { (static_cast(context))->OnSuccessResponse_2(); } @@ -27202,12 +27677,13 @@ class Test_TC_TSUIC_1_1 : public TestCommand chip::Controller::ThermostatUserInterfaceConfigurationClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster - .ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t clusterRevision) { @@ -27232,7 +27708,7 @@ class Test_TC_TSUIC_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) + void OnFailureResponse_2(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -27350,7 +27826,7 @@ class Test_TC_TSUIC_2_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint8_t temperatureDisplayMode) @@ -27360,7 +27836,7 @@ class Test_TC_TSUIC_2_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint8_t temperatureDisplayMode) @@ -27370,14 +27846,14 @@ class Test_TC_TSUIC_2_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context) { (static_cast(context))->OnSuccessResponse_3(); } static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint8_t temperatureDisplayMode) @@ -27387,7 +27863,7 @@ class Test_TC_TSUIC_2_1 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, uint8_t temperatureDisplayMode) @@ -27397,7 +27873,7 @@ class Test_TC_TSUIC_2_1 : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, uint8_t keypadLockout) @@ -27407,7 +27883,7 @@ class Test_TC_TSUIC_2_1 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, uint8_t keypadLockout) @@ -27417,14 +27893,14 @@ class Test_TC_TSUIC_2_1 : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context) { (static_cast(context))->OnSuccessResponse_8(); } static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context, uint8_t keypadLockout) @@ -27434,7 +27910,7 @@ class Test_TC_TSUIC_2_1 : public TestCommand static void OnFailureCallback_10(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_10(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_10(status); } static void OnSuccessCallback_10(void * context, uint8_t keypadLockout) @@ -27444,7 +27920,7 @@ class Test_TC_TSUIC_2_1 : public TestCommand static void OnFailureCallback_11(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_11(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_11(status); } static void OnSuccessCallback_11(void * context, uint8_t scheduleProgrammingVisibility) @@ -27454,7 +27930,7 @@ class Test_TC_TSUIC_2_1 : public TestCommand static void OnFailureCallback_12(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_12(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_12(status); } static void OnSuccessCallback_12(void * context, uint8_t scheduleProgrammingVisibility) @@ -27464,14 +27940,14 @@ class Test_TC_TSUIC_2_1 : public TestCommand static void OnFailureCallback_13(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_13(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_13(status); } static void OnSuccessCallback_13(void * context) { (static_cast(context))->OnSuccessResponse_13(); } static void OnFailureCallback_14(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_14(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_14(status); } static void OnSuccessCallback_14(void * context, uint8_t scheduleProgrammingVisibility) @@ -27481,7 +27957,7 @@ class Test_TC_TSUIC_2_1 : public TestCommand static void OnFailureCallback_15(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_15(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_15(status); } static void OnSuccessCallback_15(void * context, uint8_t scheduleProgrammingVisibility) @@ -27505,12 +27981,14 @@ class Test_TC_TSUIC_2_1 : public TestCommand chip::Controller::ThermostatUserInterfaceConfigurationClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster - .ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure( + cluster.ReadAttribute< + chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo>( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint8_t temperatureDisplayMode) { @@ -27525,12 +28003,14 @@ class Test_TC_TSUIC_2_1 : public TestCommand chip::Controller::ThermostatUserInterfaceConfigurationClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster - .ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure( + cluster.ReadAttribute< + chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo>( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint8_t temperatureDisplayMode) { @@ -27555,7 +28035,7 @@ class Test_TC_TSUIC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -27565,12 +28045,14 @@ class Test_TC_TSUIC_2_1 : public TestCommand chip::Controller::ThermostatUserInterfaceConfigurationClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster - .ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure( + cluster.ReadAttribute< + chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo>( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint8_t temperatureDisplayMode) { @@ -27585,12 +28067,14 @@ class Test_TC_TSUIC_2_1 : public TestCommand chip::Controller::ThermostatUserInterfaceConfigurationClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster - .ReadAttribute( - this, OnSuccessCallback_5, OnFailureCallback_5); + ReturnErrorOnFailure( + cluster.ReadAttribute< + chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::TemperatureDisplayMode::TypeInfo>( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(uint8_t temperatureDisplayMode) { @@ -27605,12 +28089,13 @@ class Test_TC_TSUIC_2_1 : public TestCommand chip::Controller::ThermostatUserInterfaceConfigurationClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster - .ReadAttribute( - this, OnSuccessCallback_6, OnFailureCallback_6); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(uint8_t keypadLockout) { @@ -27625,12 +28110,13 @@ class Test_TC_TSUIC_2_1 : public TestCommand chip::Controller::ThermostatUserInterfaceConfigurationClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster - .ReadAttribute( - this, OnSuccessCallback_7, OnFailureCallback_7); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(uint8_t keypadLockout) { @@ -27654,7 +28140,7 @@ class Test_TC_TSUIC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8() { NextTest(); } @@ -27664,12 +28150,13 @@ class Test_TC_TSUIC_2_1 : public TestCommand chip::Controller::ThermostatUserInterfaceConfigurationClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster - .ReadAttribute( - this, OnSuccessCallback_9, OnFailureCallback_9); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_9, OnFailureCallback_9)); + return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9(uint8_t keypadLockout) { @@ -27684,12 +28171,13 @@ class Test_TC_TSUIC_2_1 : public TestCommand chip::Controller::ThermostatUserInterfaceConfigurationClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster - .ReadAttribute( - this, OnSuccessCallback_10, OnFailureCallback_10); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_10, OnFailureCallback_10)); + return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10(uint8_t keypadLockout) { @@ -27704,12 +28192,14 @@ class Test_TC_TSUIC_2_1 : public TestCommand chip::Controller::ThermostatUserInterfaceConfigurationClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute< - chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo>( - this, OnSuccessCallback_11, OnFailureCallback_11); + ReturnErrorOnFailure( + cluster.ReadAttribute< + chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo>( + this, OnSuccessCallback_11, OnFailureCallback_11)); + return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11(uint8_t scheduleProgrammingVisibility) { @@ -27724,12 +28214,14 @@ class Test_TC_TSUIC_2_1 : public TestCommand chip::Controller::ThermostatUserInterfaceConfigurationClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute< - chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo>( - this, OnSuccessCallback_12, OnFailureCallback_12); + ReturnErrorOnFailure( + cluster.ReadAttribute< + chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo>( + this, OnSuccessCallback_12, OnFailureCallback_12)); + return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_12(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_12(uint8_t scheduleProgrammingVisibility) { @@ -27754,7 +28246,7 @@ class Test_TC_TSUIC_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_13(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_13(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_13() { NextTest(); } @@ -27764,12 +28256,14 @@ class Test_TC_TSUIC_2_1 : public TestCommand chip::Controller::ThermostatUserInterfaceConfigurationClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute< - chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo>( - this, OnSuccessCallback_14, OnFailureCallback_14); + ReturnErrorOnFailure( + cluster.ReadAttribute< + chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo>( + this, OnSuccessCallback_14, OnFailureCallback_14)); + return CHIP_NO_ERROR; } - void OnFailureResponse_14(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_14(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_14(uint8_t scheduleProgrammingVisibility) { @@ -27784,12 +28278,14 @@ class Test_TC_TSUIC_2_1 : public TestCommand chip::Controller::ThermostatUserInterfaceConfigurationClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute< - chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo>( - this, OnSuccessCallback_15, OnFailureCallback_15); + ReturnErrorOnFailure( + cluster.ReadAttribute< + chip::app::Clusters::ThermostatUserInterfaceConfiguration::Attributes::ScheduleProgrammingVisibility::TypeInfo>( + this, OnSuccessCallback_15, OnFailureCallback_15)); + return CHIP_NO_ERROR; } - void OnFailureResponse_15(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_15(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_15(uint8_t scheduleProgrammingVisibility) { @@ -27896,70 +28392,70 @@ class Test_TC_TSUIC_2_2 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context) { (static_cast(context))->OnSuccessResponse_1(); } static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context) { (static_cast(context))->OnSuccessResponse_2(); } static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context) { (static_cast(context))->OnSuccessResponse_3(); } static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context) { (static_cast(context))->OnSuccessResponse_4(); } static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context) { (static_cast(context))->OnSuccessResponse_5(); } static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context) { (static_cast(context))->OnSuccessResponse_6(); } static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context) { (static_cast(context))->OnSuccessResponse_7(); } static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context) { (static_cast(context))->OnSuccessResponse_8(); } static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context) { (static_cast(context))->OnSuccessResponse_9(); } static void OnFailureCallback_10(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_10(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_10(status); } static void OnSuccessCallback_10(void * context) { (static_cast(context))->OnSuccessResponse_10(); } @@ -27990,7 +28486,7 @@ class Test_TC_TSUIC_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -28010,7 +28506,7 @@ class Test_TC_TSUIC_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2() { NextTest(); } @@ -28029,7 +28525,7 @@ class Test_TC_TSUIC_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -28048,7 +28544,7 @@ class Test_TC_TSUIC_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -28067,7 +28563,7 @@ class Test_TC_TSUIC_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -28086,7 +28582,7 @@ class Test_TC_TSUIC_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6() { NextTest(); } @@ -28105,7 +28601,7 @@ class Test_TC_TSUIC_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7() { NextTest(); } @@ -28124,7 +28620,7 @@ class Test_TC_TSUIC_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8() { NextTest(); } @@ -28144,7 +28640,7 @@ class Test_TC_TSUIC_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9() { NextTest(); } @@ -28164,7 +28660,7 @@ class Test_TC_TSUIC_2_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10() { NextTest(); } }; @@ -28235,7 +28731,7 @@ class Test_TC_DIAGTH_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t clusterRevision) @@ -28245,7 +28741,7 @@ class Test_TC_DIAGTH_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint16_t clusterRevision) @@ -28255,14 +28751,14 @@ class Test_TC_DIAGTH_1_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context) { (static_cast(context))->OnSuccessResponse_3(); } static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint16_t clusterRevision) @@ -28286,11 +28782,13 @@ class Test_TC_DIAGTH_1_1 : public TestCommand chip::Controller::ThreadNetworkDiagnosticsClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t clusterRevision) { @@ -28305,11 +28803,13 @@ class Test_TC_DIAGTH_1_1 : public TestCommand chip::Controller::ThreadNetworkDiagnosticsClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint16_t clusterRevision) { @@ -28333,7 +28833,7 @@ class Test_TC_DIAGTH_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) + void OnFailureResponse_3(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -28347,11 +28847,13 @@ class Test_TC_DIAGTH_1_1 : public TestCommand chip::Controller::ThreadNetworkDiagnosticsClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint16_t clusterRevision) { @@ -28436,7 +28938,7 @@ class Test_TC_WNCV_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint16_t clusterRevision) @@ -28446,14 +28948,14 @@ class Test_TC_WNCV_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context) { (static_cast(context))->OnSuccessResponse_2(); } static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint16_t clusterRevision) @@ -28463,7 +28965,7 @@ class Test_TC_WNCV_1_1 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint32_t featureMap) @@ -28473,14 +28975,14 @@ class Test_TC_WNCV_1_1 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context) { (static_cast(context))->OnSuccessResponse_5(); } static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, uint32_t featureMap) @@ -28504,11 +29006,12 @@ class Test_TC_WNCV_1_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint16_t clusterRevision) { @@ -28533,7 +29036,7 @@ class Test_TC_WNCV_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) + void OnFailureResponse_2(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -28547,11 +29050,12 @@ class Test_TC_WNCV_1_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint16_t clusterRevision) { @@ -28567,11 +29071,12 @@ class Test_TC_WNCV_1_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint32_t featureMap) { @@ -28595,7 +29100,7 @@ class Test_TC_WNCV_1_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) + void OnFailureResponse_5(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -28609,11 +29114,12 @@ class Test_TC_WNCV_1_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_6, OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(uint32_t featureMap) { @@ -28922,7 +29428,7 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint8_t type) @@ -28932,14 +29438,14 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context) { (static_cast(context))->OnSuccessResponse_2(); } static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint8_t type) @@ -28949,7 +29455,7 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint8_t configStatus) @@ -28959,14 +29465,14 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context) { (static_cast(context))->OnSuccessResponse_5(); } static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, uint8_t configStatus) @@ -28976,7 +29482,7 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, uint8_t operationalStatus) @@ -28986,14 +29492,14 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context) { (static_cast(context))->OnSuccessResponse_8(); } static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context, uint8_t operationalStatus) @@ -29003,7 +29509,7 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_10(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_10(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_10(status); } static void OnSuccessCallback_10(void * context, uint8_t endProductType) @@ -29013,14 +29519,14 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_11(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_11(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_11(status); } static void OnSuccessCallback_11(void * context) { (static_cast(context))->OnSuccessResponse_11(); } static void OnFailureCallback_12(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_12(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_12(status); } static void OnSuccessCallback_12(void * context, uint8_t endProductType) @@ -29030,7 +29536,7 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_13(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_13(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_13(status); } static void OnSuccessCallback_13(void * context, uint8_t mode) @@ -29040,14 +29546,14 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_14(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_14(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_14(status); } static void OnSuccessCallback_14(void * context) { (static_cast(context))->OnSuccessResponse_14(); } static void OnFailureCallback_15(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_15(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_15(status); } static void OnSuccessCallback_15(void * context, uint8_t mode) @@ -29057,7 +29563,7 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_16(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_16(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_16(status); } static void OnSuccessCallback_16(void * context, uint16_t targetPositionLiftPercent100ths) @@ -29067,14 +29573,14 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_17(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_17(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_17(status); } static void OnSuccessCallback_17(void * context) { (static_cast(context))->OnSuccessResponse_17(); } static void OnFailureCallback_18(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_18(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_18(status); } static void OnSuccessCallback_18(void * context, uint16_t targetPositionLiftPercent100ths) @@ -29084,7 +29590,7 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_19(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_19(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_19(status); } static void OnSuccessCallback_19(void * context, uint16_t targetPositionTiltPercent100ths) @@ -29094,14 +29600,14 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_20(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_20(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_20(status); } static void OnSuccessCallback_20(void * context) { (static_cast(context))->OnSuccessResponse_20(); } static void OnFailureCallback_21(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_21(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_21(status); } static void OnSuccessCallback_21(void * context, uint16_t targetPositionTiltPercent100ths) @@ -29111,7 +29617,7 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_22(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_22(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_22(status); } static void OnSuccessCallback_22(void * context, uint16_t currentPositionLiftPercent100ths) @@ -29121,14 +29627,14 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_23(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_23(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_23(status); } static void OnSuccessCallback_23(void * context) { (static_cast(context))->OnSuccessResponse_23(); } static void OnFailureCallback_24(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_24(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_24(status); } static void OnSuccessCallback_24(void * context, uint16_t currentPositionLiftPercent100ths) @@ -29138,7 +29644,7 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_25(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_25(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_25(status); } static void OnSuccessCallback_25(void * context, uint16_t currentPositionTiltPercent100ths) @@ -29148,14 +29654,14 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_26(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_26(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_26(status); } static void OnSuccessCallback_26(void * context) { (static_cast(context))->OnSuccessResponse_26(); } static void OnFailureCallback_27(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_27(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_27(status); } static void OnSuccessCallback_27(void * context, uint16_t currentPositionTiltPercent100ths) @@ -29165,7 +29671,7 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_28(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_28(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_28(status); } static void OnSuccessCallback_28(void * context, uint16_t installedOpenLimitLift) @@ -29175,14 +29681,14 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_29(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_29(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_29(status); } static void OnSuccessCallback_29(void * context) { (static_cast(context))->OnSuccessResponse_29(); } static void OnFailureCallback_30(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_30(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_30(status); } static void OnSuccessCallback_30(void * context, uint16_t installedOpenLimitLift) @@ -29192,7 +29698,7 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_31(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_31(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_31(status); } static void OnSuccessCallback_31(void * context, uint16_t installedClosedLimitLift) @@ -29202,14 +29708,14 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_32(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_32(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_32(status); } static void OnSuccessCallback_32(void * context) { (static_cast(context))->OnSuccessResponse_32(); } static void OnFailureCallback_33(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_33(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_33(status); } static void OnSuccessCallback_33(void * context, uint16_t installedClosedLimitLift) @@ -29219,7 +29725,7 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_34(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_34(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_34(status); } static void OnSuccessCallback_34(void * context, uint16_t installedOpenLimitTilt) @@ -29229,14 +29735,14 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_35(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_35(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_35(status); } static void OnSuccessCallback_35(void * context) { (static_cast(context))->OnSuccessResponse_35(); } static void OnFailureCallback_36(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_36(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_36(status); } static void OnSuccessCallback_36(void * context, uint16_t installedOpenLimitTilt) @@ -29246,7 +29752,7 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_37(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_37(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_37(status); } static void OnSuccessCallback_37(void * context, uint16_t installedClosedLimitTilt) @@ -29256,14 +29762,14 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_38(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_38(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_38(status); } static void OnSuccessCallback_38(void * context) { (static_cast(context))->OnSuccessResponse_38(); } static void OnFailureCallback_39(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_39(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_39(status); } static void OnSuccessCallback_39(void * context, uint16_t installedClosedLimitTilt) @@ -29273,7 +29779,7 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_40(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_40(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_40(status); } static void OnSuccessCallback_40(void * context, uint16_t safetyStatus) @@ -29283,14 +29789,14 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_41(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_41(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_41(status); } static void OnSuccessCallback_41(void * context) { (static_cast(context))->OnSuccessResponse_41(); } static void OnFailureCallback_42(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_42(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_42(status); } static void OnSuccessCallback_42(void * context, uint16_t safetyStatus) @@ -29300,7 +29806,7 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_43(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_43(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_43(status); } static void OnSuccessCallback_43(void * context, uint16_t currentPositionLift) @@ -29310,14 +29816,14 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_44(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_44(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_44(status); } static void OnSuccessCallback_44(void * context) { (static_cast(context))->OnSuccessResponse_44(); } static void OnFailureCallback_45(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_45(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_45(status); } static void OnSuccessCallback_45(void * context, uint16_t currentPositionLift) @@ -29327,7 +29833,7 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_46(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_46(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_46(status); } static void OnSuccessCallback_46(void * context, uint16_t currentPositionTilt) @@ -29337,14 +29843,14 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_47(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_47(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_47(status); } static void OnSuccessCallback_47(void * context) { (static_cast(context))->OnSuccessResponse_47(); } static void OnFailureCallback_48(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_48(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_48(status); } static void OnSuccessCallback_48(void * context, uint16_t currentPositionTilt) @@ -29354,7 +29860,7 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_49(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_49(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_49(status); } static void OnSuccessCallback_49(void * context, uint8_t currentPositionLiftPercentage) @@ -29364,14 +29870,14 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_50(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_50(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_50(status); } static void OnSuccessCallback_50(void * context) { (static_cast(context))->OnSuccessResponse_50(); } static void OnFailureCallback_51(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_51(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_51(status); } static void OnSuccessCallback_51(void * context, uint8_t currentPositionLiftPercentage) @@ -29381,7 +29887,7 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_52(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_52(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_52(status); } static void OnSuccessCallback_52(void * context, uint8_t currentPositionTiltPercentage) @@ -29391,14 +29897,14 @@ class Test_TC_WNCV_2_1 : public TestCommand static void OnFailureCallback_53(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_53(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_53(status); } static void OnSuccessCallback_53(void * context) { (static_cast(context))->OnSuccessResponse_53(); } static void OnFailureCallback_54(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_54(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_54(status); } static void OnSuccessCallback_54(void * context, uint8_t currentPositionTiltPercentage) @@ -29422,11 +29928,12 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_1, - OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint8_t type) { @@ -29450,7 +29957,7 @@ class Test_TC_WNCV_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) + void OnFailureResponse_2(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -29464,11 +29971,12 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_3, - OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint8_t type) { @@ -29484,11 +29992,12 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint8_t configStatus) { @@ -29512,7 +30021,7 @@ class Test_TC_WNCV_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) + void OnFailureResponse_5(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -29526,11 +30035,12 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_6, OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(uint8_t configStatus) { @@ -29546,11 +30056,12 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_7, OnFailureCallback_7); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(uint8_t operationalStatus) { @@ -29574,7 +30085,7 @@ class Test_TC_WNCV_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) + void OnFailureResponse_8(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -29588,11 +30099,12 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_9, OnFailureCallback_9); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_9, OnFailureCallback_9)); + return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9(uint8_t operationalStatus) { @@ -29608,11 +30120,12 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_10, OnFailureCallback_10); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_10, OnFailureCallback_10)); + return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10(uint8_t endProductType) { @@ -29636,7 +30149,7 @@ class Test_TC_WNCV_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) + void OnFailureResponse_11(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -29650,11 +30163,12 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_12, OnFailureCallback_12); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_12, OnFailureCallback_12)); + return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_12(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_12(uint8_t endProductType) { @@ -29670,11 +30184,12 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_13, - OnFailureCallback_13); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_13, OnFailureCallback_13)); + return CHIP_NO_ERROR; } - void OnFailureResponse_13(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_13(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_13(uint8_t mode) { @@ -29698,7 +30213,7 @@ class Test_TC_WNCV_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_14(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_14(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_14() { NextTest(); } @@ -29708,11 +30223,12 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_15, - OnFailureCallback_15); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_15, OnFailureCallback_15)); + return CHIP_NO_ERROR; } - void OnFailureResponse_15(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_15(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_15(uint8_t mode) { @@ -29727,11 +30243,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_16, OnFailureCallback_16); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_16, OnFailureCallback_16)); + return CHIP_NO_ERROR; } - void OnFailureResponse_16(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_16(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_16(uint16_t targetPositionLiftPercent100ths) { @@ -29757,7 +30275,7 @@ class Test_TC_WNCV_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_17(uint8_t status) + void OnFailureResponse_17(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -29771,11 +30289,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_18, OnFailureCallback_18); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_18, OnFailureCallback_18)); + return CHIP_NO_ERROR; } - void OnFailureResponse_18(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_18(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_18(uint16_t targetPositionLiftPercent100ths) { @@ -29791,11 +30311,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_19, OnFailureCallback_19); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_19, OnFailureCallback_19)); + return CHIP_NO_ERROR; } - void OnFailureResponse_19(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_19(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_19(uint16_t targetPositionTiltPercent100ths) { @@ -29821,7 +30343,7 @@ class Test_TC_WNCV_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_20(uint8_t status) + void OnFailureResponse_20(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -29835,11 +30357,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_21, OnFailureCallback_21); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_21, OnFailureCallback_21)); + return CHIP_NO_ERROR; } - void OnFailureResponse_21(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_21(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_21(uint16_t targetPositionTiltPercent100ths) { @@ -29855,11 +30379,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_22, OnFailureCallback_22); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_22, OnFailureCallback_22)); + return CHIP_NO_ERROR; } - void OnFailureResponse_22(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_22(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_22(uint16_t currentPositionLiftPercent100ths) { @@ -29885,7 +30411,7 @@ class Test_TC_WNCV_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_23(uint8_t status) + void OnFailureResponse_23(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -29899,11 +30425,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_24, OnFailureCallback_24); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_24, OnFailureCallback_24)); + return CHIP_NO_ERROR; } - void OnFailureResponse_24(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_24(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_24(uint16_t currentPositionLiftPercent100ths) { @@ -29919,11 +30447,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_25, OnFailureCallback_25); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_25, OnFailureCallback_25)); + return CHIP_NO_ERROR; } - void OnFailureResponse_25(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_25(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_25(uint16_t currentPositionTiltPercent100ths) { @@ -29949,7 +30479,7 @@ class Test_TC_WNCV_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_26(uint8_t status) + void OnFailureResponse_26(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -29963,11 +30493,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_27, OnFailureCallback_27); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_27, OnFailureCallback_27)); + return CHIP_NO_ERROR; } - void OnFailureResponse_27(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_27(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_27(uint16_t currentPositionTiltPercent100ths) { @@ -29983,11 +30515,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_28, OnFailureCallback_28); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_28, OnFailureCallback_28)); + return CHIP_NO_ERROR; } - void OnFailureResponse_28(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_28(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_28(uint16_t installedOpenLimitLift) { @@ -30012,7 +30546,7 @@ class Test_TC_WNCV_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_29(uint8_t status) + void OnFailureResponse_29(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -30026,11 +30560,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_30, OnFailureCallback_30); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_30, OnFailureCallback_30)); + return CHIP_NO_ERROR; } - void OnFailureResponse_30(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_30(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_30(uint16_t installedOpenLimitLift) { @@ -30046,11 +30582,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_31, OnFailureCallback_31); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_31, OnFailureCallback_31)); + return CHIP_NO_ERROR; } - void OnFailureResponse_31(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_31(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_31(uint16_t installedClosedLimitLift) { @@ -30075,7 +30613,7 @@ class Test_TC_WNCV_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_32(uint8_t status) + void OnFailureResponse_32(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -30089,11 +30627,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_33, OnFailureCallback_33); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_33, OnFailureCallback_33)); + return CHIP_NO_ERROR; } - void OnFailureResponse_33(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_33(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_33(uint16_t installedClosedLimitLift) { @@ -30109,11 +30649,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_34, OnFailureCallback_34); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_34, OnFailureCallback_34)); + return CHIP_NO_ERROR; } - void OnFailureResponse_34(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_34(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_34(uint16_t installedOpenLimitTilt) { @@ -30138,7 +30680,7 @@ class Test_TC_WNCV_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_35(uint8_t status) + void OnFailureResponse_35(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -30152,11 +30694,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_36, OnFailureCallback_36); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_36, OnFailureCallback_36)); + return CHIP_NO_ERROR; } - void OnFailureResponse_36(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_36(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_36(uint16_t installedOpenLimitTilt) { @@ -30172,11 +30716,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_37, OnFailureCallback_37); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_37, OnFailureCallback_37)); + return CHIP_NO_ERROR; } - void OnFailureResponse_37(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_37(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_37(uint16_t installedClosedLimitTilt) { @@ -30201,7 +30747,7 @@ class Test_TC_WNCV_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_38(uint8_t status) + void OnFailureResponse_38(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -30215,11 +30761,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_39, OnFailureCallback_39); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_39, OnFailureCallback_39)); + return CHIP_NO_ERROR; } - void OnFailureResponse_39(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_39(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_39(uint16_t installedClosedLimitTilt) { @@ -30235,11 +30783,12 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_40, OnFailureCallback_40); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_40, OnFailureCallback_40)); + return CHIP_NO_ERROR; } - void OnFailureResponse_40(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_40(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_40(uint16_t safetyStatus) { @@ -30263,7 +30812,7 @@ class Test_TC_WNCV_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_41(uint8_t status) + void OnFailureResponse_41(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -30277,11 +30826,12 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_42, OnFailureCallback_42); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_42, OnFailureCallback_42)); + return CHIP_NO_ERROR; } - void OnFailureResponse_42(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_42(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_42(uint16_t safetyStatus) { @@ -30297,11 +30847,12 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_43, OnFailureCallback_43); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_43, OnFailureCallback_43)); + return CHIP_NO_ERROR; } - void OnFailureResponse_43(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_43(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_43(uint16_t currentPositionLift) { @@ -30325,7 +30876,7 @@ class Test_TC_WNCV_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_44(uint8_t status) + void OnFailureResponse_44(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -30339,11 +30890,12 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_45, OnFailureCallback_45); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_45, OnFailureCallback_45)); + return CHIP_NO_ERROR; } - void OnFailureResponse_45(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_45(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_45(uint16_t currentPositionLift) { @@ -30359,11 +30911,12 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_46, OnFailureCallback_46); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_46, OnFailureCallback_46)); + return CHIP_NO_ERROR; } - void OnFailureResponse_46(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_46(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_46(uint16_t currentPositionTilt) { @@ -30387,7 +30940,7 @@ class Test_TC_WNCV_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_47(uint8_t status) + void OnFailureResponse_47(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -30401,11 +30954,12 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_48, OnFailureCallback_48); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_48, OnFailureCallback_48)); + return CHIP_NO_ERROR; } - void OnFailureResponse_48(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_48(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_48(uint16_t currentPositionTilt) { @@ -30421,11 +30975,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_49, OnFailureCallback_49); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_49, OnFailureCallback_49)); + return CHIP_NO_ERROR; } - void OnFailureResponse_49(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_49(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_49(uint8_t currentPositionLiftPercentage) { @@ -30450,7 +31006,7 @@ class Test_TC_WNCV_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_50(uint8_t status) + void OnFailureResponse_50(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -30464,11 +31020,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_51, OnFailureCallback_51); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_51, OnFailureCallback_51)); + return CHIP_NO_ERROR; } - void OnFailureResponse_51(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_51(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_51(uint8_t currentPositionLiftPercentage) { @@ -30484,11 +31042,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_52, OnFailureCallback_52); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_52, OnFailureCallback_52)); + return CHIP_NO_ERROR; } - void OnFailureResponse_52(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_52(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_52(uint8_t currentPositionTiltPercentage) { @@ -30513,7 +31073,7 @@ class Test_TC_WNCV_2_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_53(uint8_t status) + void OnFailureResponse_53(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); @@ -30527,11 +31087,13 @@ class Test_TC_WNCV_2_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_54, OnFailureCallback_54); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_54, OnFailureCallback_54)); + return CHIP_NO_ERROR; } - void OnFailureResponse_54(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_54(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_54(uint8_t currentPositionTiltPercentage) { @@ -30657,7 +31219,7 @@ class Test_TC_WNCV_2_4 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint8_t type) @@ -30667,7 +31229,7 @@ class Test_TC_WNCV_2_4 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint8_t type) @@ -30691,11 +31253,12 @@ class Test_TC_WNCV_2_4 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_1, - OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint8_t type) { @@ -30710,11 +31273,12 @@ class Test_TC_WNCV_2_4 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint8_t type) { @@ -30782,7 +31346,7 @@ class Test_TC_WNCV_2_5 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint8_t endProductType) @@ -30792,7 +31356,7 @@ class Test_TC_WNCV_2_5 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint8_t endProductType) @@ -30816,11 +31380,12 @@ class Test_TC_WNCV_2_5 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint8_t endProductType) { @@ -30835,11 +31400,12 @@ class Test_TC_WNCV_2_5 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint8_t endProductType) { @@ -30911,7 +31477,7 @@ class Test_TC_WNCV_3_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint8_t operationalStatus) @@ -30948,7 +31514,7 @@ class Test_TC_WNCV_3_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -30971,7 +31537,7 @@ class Test_TC_WNCV_3_1 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2() { NextTest(); } @@ -30981,11 +31547,12 @@ class Test_TC_WNCV_3_1 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint8_t operationalStatus) { @@ -31056,7 +31623,7 @@ class Test_TC_WNCV_3_2 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint8_t operationalStatus) @@ -31093,7 +31660,7 @@ class Test_TC_WNCV_3_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -31116,7 +31683,7 @@ class Test_TC_WNCV_3_2 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2() { NextTest(); } @@ -31126,11 +31693,12 @@ class Test_TC_WNCV_3_2 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint8_t operationalStatus) { @@ -31201,7 +31769,7 @@ class Test_TC_WNCV_3_3 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint8_t operationalStatus) @@ -31238,7 +31806,7 @@ class Test_TC_WNCV_3_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -31261,7 +31829,7 @@ class Test_TC_WNCV_3_3 : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2() { NextTest(); } @@ -31271,11 +31839,12 @@ class Test_TC_WNCV_3_3 : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint8_t operationalStatus) { @@ -31342,7 +31911,7 @@ class TV_TargetNavigatorCluster : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1( @@ -31369,11 +31938,12 @@ class TV_TargetNavigatorCluster : public TestCommand chip::Controller::TargetNavigatorClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1( const chip::app::DataModel::DecodableList< @@ -31412,7 +31982,7 @@ class TV_TargetNavigatorCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(chip::app::Clusters::TargetNavigator::NavigateTargetStatus status, chip::CharSpan data) { NextTest(); } }; @@ -31478,7 +32048,7 @@ class TV_AudioOutputCluster : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1( @@ -31505,11 +32075,12 @@ class TV_AudioOutputCluster : public TestCommand chip::Controller::AudioOutputClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1( const chip::app::DataModel::DecodableList & @@ -31553,7 +32124,7 @@ class TV_AudioOutputCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2() { NextTest(); } @@ -31578,7 +32149,7 @@ class TV_AudioOutputCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } }; @@ -31648,7 +32219,7 @@ class TV_ApplicationLauncherCluster : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, const chip::app::DataModel::DecodableList & applicationLauncherList) @@ -31658,7 +32229,7 @@ class TV_ApplicationLauncherCluster : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint8_t catalogVendorId) @@ -31668,7 +32239,7 @@ class TV_ApplicationLauncherCluster : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint8_t applicationId) @@ -31692,11 +32263,13 @@ class TV_ApplicationLauncherCluster : public TestCommand chip::Controller::ApplicationLauncherClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(const chip::app::DataModel::DecodableList & applicationLauncherList) { @@ -31732,7 +32305,7 @@ class TV_ApplicationLauncherCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(chip::app::Clusters::ApplicationLauncher::ApplicationLauncherStatus status, chip::CharSpan data) { @@ -31746,11 +32319,12 @@ class TV_ApplicationLauncherCluster : public TestCommand chip::Controller::ApplicationLauncherClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint8_t catalogVendorId) { @@ -31765,11 +32339,12 @@ class TV_ApplicationLauncherCluster : public TestCommand chip::Controller::ApplicationLauncherClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint8_t applicationId) { @@ -31860,7 +32435,7 @@ class TV_KeypadInputCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(chip::app::Clusters::KeypadInput::KeypadInputStatus status) { NextTest(); } }; @@ -31950,7 +32525,7 @@ class TV_AccountLoginCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(chip::CharSpan setupPIN) { NextTest(); } @@ -31975,7 +32550,7 @@ class TV_AccountLoginCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2() { NextTest(); } }; @@ -32033,7 +32608,7 @@ class TV_WakeOnLanCluster : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, chip::CharSpan wakeOnLanMacAddress) @@ -32057,11 +32632,12 @@ class TV_WakeOnLanCluster : public TestCommand chip::Controller::WakeOnLanClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(chip::CharSpan wakeOnLanMacAddress) { @@ -32136,7 +32712,7 @@ class TV_ApplicationBasicCluster : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint16_t vendorId) @@ -32146,7 +32722,7 @@ class TV_ApplicationBasicCluster : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint16_t productId) @@ -32156,7 +32732,7 @@ class TV_ApplicationBasicCluster : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint16_t catalogVendorId) @@ -32194,7 +32770,7 @@ class TV_ApplicationBasicCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -32204,11 +32780,12 @@ class TV_ApplicationBasicCluster : public TestCommand chip::Controller::ApplicationBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint16_t vendorId) { @@ -32223,11 +32800,12 @@ class TV_ApplicationBasicCluster : public TestCommand chip::Controller::ApplicationBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint16_t productId) { @@ -32242,11 +32820,12 @@ class TV_ApplicationBasicCluster : public TestCommand chip::Controller::ApplicationBasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint16_t catalogVendorId) { @@ -32376,7 +32955,7 @@ class TV_MediaPlaybackCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) { @@ -32404,7 +32983,7 @@ class TV_MediaPlaybackCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) { @@ -32432,7 +33011,7 @@ class TV_MediaPlaybackCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) { @@ -32460,7 +33039,7 @@ class TV_MediaPlaybackCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) { @@ -32488,7 +33067,7 @@ class TV_MediaPlaybackCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) { @@ -32516,7 +33095,7 @@ class TV_MediaPlaybackCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) { @@ -32544,7 +33123,7 @@ class TV_MediaPlaybackCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) { @@ -32572,7 +33151,7 @@ class TV_MediaPlaybackCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) { @@ -32601,7 +33180,7 @@ class TV_MediaPlaybackCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) { @@ -32630,7 +33209,7 @@ class TV_MediaPlaybackCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) { @@ -32659,7 +33238,7 @@ class TV_MediaPlaybackCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11(chip::app::Clusters::MediaPlayback::MediaPlaybackStatus mediaPlaybackStatus) { @@ -32730,7 +33309,7 @@ class TV_TvChannelCluster : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1( @@ -32757,11 +33336,12 @@ class TV_TvChannelCluster : public TestCommand chip::Controller::TvChannelClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_1, - OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1( const chip::app::DataModel::DecodableList & @@ -32810,7 +33390,7 @@ class TV_TvChannelCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2() { NextTest(); } @@ -32834,7 +33414,7 @@ class TV_TvChannelCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } }; @@ -32919,7 +33499,7 @@ class TV_LowPowerCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } }; @@ -32997,7 +33577,7 @@ class TV_MediaInputCluster : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1( @@ -33010,7 +33590,7 @@ class TV_MediaInputCluster : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint8_t currentMediaInput) @@ -33034,11 +33614,12 @@ class TV_MediaInputCluster : public TestCommand chip::Controller::MediaInputClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1( const chip::app::DataModel::DecodableList & @@ -33082,7 +33663,7 @@ class TV_MediaInputCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2() { NextTest(); } @@ -33092,11 +33673,12 @@ class TV_MediaInputCluster : public TestCommand chip::Controller::MediaInputClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint8_t currentMediaInput) { @@ -33124,7 +33706,7 @@ class TV_MediaInputCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -33147,7 +33729,7 @@ class TV_MediaInputCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -33172,7 +33754,7 @@ class TV_MediaInputCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6() { NextTest(); } }; @@ -34431,7 +35013,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, bool boolean) @@ -34441,14 +35023,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context) { (static_cast(context))->OnSuccessResponse_7(); } static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context, bool boolean) @@ -34458,14 +35040,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context) { (static_cast(context))->OnSuccessResponse_9(); } static void OnFailureCallback_10(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_10(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_10(status); } static void OnSuccessCallback_10(void * context, bool boolean) @@ -34475,7 +35057,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_11(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_11(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_11(status); } static void OnSuccessCallback_11(void * context, uint8_t bitmap8) @@ -34485,14 +35067,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_12(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_12(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_12(status); } static void OnSuccessCallback_12(void * context) { (static_cast(context))->OnSuccessResponse_12(); } static void OnFailureCallback_13(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_13(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_13(status); } static void OnSuccessCallback_13(void * context, uint8_t bitmap8) @@ -34502,14 +35084,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_14(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_14(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_14(status); } static void OnSuccessCallback_14(void * context) { (static_cast(context))->OnSuccessResponse_14(); } static void OnFailureCallback_15(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_15(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_15(status); } static void OnSuccessCallback_15(void * context, uint8_t bitmap8) @@ -34519,7 +35101,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_16(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_16(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_16(status); } static void OnSuccessCallback_16(void * context, uint16_t bitmap16) @@ -34529,14 +35111,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_17(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_17(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_17(status); } static void OnSuccessCallback_17(void * context) { (static_cast(context))->OnSuccessResponse_17(); } static void OnFailureCallback_18(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_18(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_18(status); } static void OnSuccessCallback_18(void * context, uint16_t bitmap16) @@ -34546,14 +35128,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_19(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_19(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_19(status); } static void OnSuccessCallback_19(void * context) { (static_cast(context))->OnSuccessResponse_19(); } static void OnFailureCallback_20(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_20(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_20(status); } static void OnSuccessCallback_20(void * context, uint16_t bitmap16) @@ -34563,7 +35145,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_21(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_21(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_21(status); } static void OnSuccessCallback_21(void * context, uint32_t bitmap32) @@ -34573,14 +35155,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_22(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_22(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_22(status); } static void OnSuccessCallback_22(void * context) { (static_cast(context))->OnSuccessResponse_22(); } static void OnFailureCallback_23(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_23(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_23(status); } static void OnSuccessCallback_23(void * context, uint32_t bitmap32) @@ -34590,14 +35172,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_24(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_24(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_24(status); } static void OnSuccessCallback_24(void * context) { (static_cast(context))->OnSuccessResponse_24(); } static void OnFailureCallback_25(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_25(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_25(status); } static void OnSuccessCallback_25(void * context, uint32_t bitmap32) @@ -34607,7 +35189,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_26(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_26(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_26(status); } static void OnSuccessCallback_26(void * context, uint64_t bitmap64) @@ -34617,14 +35199,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_27(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_27(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_27(status); } static void OnSuccessCallback_27(void * context) { (static_cast(context))->OnSuccessResponse_27(); } static void OnFailureCallback_28(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_28(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_28(status); } static void OnSuccessCallback_28(void * context, uint64_t bitmap64) @@ -34634,14 +35216,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_29(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_29(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_29(status); } static void OnSuccessCallback_29(void * context) { (static_cast(context))->OnSuccessResponse_29(); } static void OnFailureCallback_30(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_30(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_30(status); } static void OnSuccessCallback_30(void * context, uint64_t bitmap64) @@ -34651,7 +35233,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_31(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_31(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_31(status); } static void OnSuccessCallback_31(void * context, uint8_t int8u) @@ -34661,14 +35243,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_32(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_32(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_32(status); } static void OnSuccessCallback_32(void * context) { (static_cast(context))->OnSuccessResponse_32(); } static void OnFailureCallback_33(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_33(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_33(status); } static void OnSuccessCallback_33(void * context, uint8_t int8u) @@ -34678,14 +35260,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_34(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_34(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_34(status); } static void OnSuccessCallback_34(void * context) { (static_cast(context))->OnSuccessResponse_34(); } static void OnFailureCallback_35(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_35(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_35(status); } static void OnSuccessCallback_35(void * context, uint8_t int8u) @@ -34695,7 +35277,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_36(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_36(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_36(status); } static void OnSuccessCallback_36(void * context, uint16_t int16u) @@ -34705,14 +35287,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_37(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_37(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_37(status); } static void OnSuccessCallback_37(void * context) { (static_cast(context))->OnSuccessResponse_37(); } static void OnFailureCallback_38(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_38(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_38(status); } static void OnSuccessCallback_38(void * context, uint16_t int16u) @@ -34722,14 +35304,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_39(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_39(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_39(status); } static void OnSuccessCallback_39(void * context) { (static_cast(context))->OnSuccessResponse_39(); } static void OnFailureCallback_40(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_40(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_40(status); } static void OnSuccessCallback_40(void * context, uint16_t int16u) @@ -34739,7 +35321,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_41(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_41(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_41(status); } static void OnSuccessCallback_41(void * context, uint32_t int32u) @@ -34749,14 +35331,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_42(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_42(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_42(status); } static void OnSuccessCallback_42(void * context) { (static_cast(context))->OnSuccessResponse_42(); } static void OnFailureCallback_43(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_43(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_43(status); } static void OnSuccessCallback_43(void * context, uint32_t int32u) @@ -34766,14 +35348,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_44(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_44(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_44(status); } static void OnSuccessCallback_44(void * context) { (static_cast(context))->OnSuccessResponse_44(); } static void OnFailureCallback_45(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_45(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_45(status); } static void OnSuccessCallback_45(void * context, uint32_t int32u) @@ -34783,7 +35365,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_46(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_46(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_46(status); } static void OnSuccessCallback_46(void * context, uint64_t int64u) @@ -34793,14 +35375,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_47(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_47(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_47(status); } static void OnSuccessCallback_47(void * context) { (static_cast(context))->OnSuccessResponse_47(); } static void OnFailureCallback_48(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_48(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_48(status); } static void OnSuccessCallback_48(void * context, uint64_t int64u) @@ -34810,14 +35392,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_49(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_49(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_49(status); } static void OnSuccessCallback_49(void * context) { (static_cast(context))->OnSuccessResponse_49(); } static void OnFailureCallback_50(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_50(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_50(status); } static void OnSuccessCallback_50(void * context, uint64_t int64u) @@ -34827,7 +35409,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_51(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_51(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_51(status); } static void OnSuccessCallback_51(void * context, int8_t int8s) @@ -34837,14 +35419,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_52(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_52(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_52(status); } static void OnSuccessCallback_52(void * context) { (static_cast(context))->OnSuccessResponse_52(); } static void OnFailureCallback_53(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_53(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_53(status); } static void OnSuccessCallback_53(void * context, int8_t int8s) @@ -34854,14 +35436,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_54(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_54(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_54(status); } static void OnSuccessCallback_54(void * context) { (static_cast(context))->OnSuccessResponse_54(); } static void OnFailureCallback_55(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_55(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_55(status); } static void OnSuccessCallback_55(void * context, int8_t int8s) @@ -34871,14 +35453,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_56(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_56(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_56(status); } static void OnSuccessCallback_56(void * context) { (static_cast(context))->OnSuccessResponse_56(); } static void OnFailureCallback_57(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_57(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_57(status); } static void OnSuccessCallback_57(void * context, int8_t int8s) @@ -34888,7 +35470,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_58(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_58(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_58(status); } static void OnSuccessCallback_58(void * context, int16_t int16s) @@ -34898,14 +35480,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_59(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_59(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_59(status); } static void OnSuccessCallback_59(void * context) { (static_cast(context))->OnSuccessResponse_59(); } static void OnFailureCallback_60(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_60(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_60(status); } static void OnSuccessCallback_60(void * context, int16_t int16s) @@ -34915,14 +35497,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_61(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_61(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_61(status); } static void OnSuccessCallback_61(void * context) { (static_cast(context))->OnSuccessResponse_61(); } static void OnFailureCallback_62(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_62(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_62(status); } static void OnSuccessCallback_62(void * context, int16_t int16s) @@ -34932,14 +35514,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_63(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_63(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_63(status); } static void OnSuccessCallback_63(void * context) { (static_cast(context))->OnSuccessResponse_63(); } static void OnFailureCallback_64(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_64(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_64(status); } static void OnSuccessCallback_64(void * context, int16_t int16s) @@ -34949,7 +35531,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_65(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_65(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_65(status); } static void OnSuccessCallback_65(void * context, int32_t int32s) @@ -34959,14 +35541,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_66(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_66(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_66(status); } static void OnSuccessCallback_66(void * context) { (static_cast(context))->OnSuccessResponse_66(); } static void OnFailureCallback_67(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_67(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_67(status); } static void OnSuccessCallback_67(void * context, int32_t int32s) @@ -34976,14 +35558,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_68(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_68(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_68(status); } static void OnSuccessCallback_68(void * context) { (static_cast(context))->OnSuccessResponse_68(); } static void OnFailureCallback_69(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_69(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_69(status); } static void OnSuccessCallback_69(void * context, int32_t int32s) @@ -34993,14 +35575,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_70(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_70(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_70(status); } static void OnSuccessCallback_70(void * context) { (static_cast(context))->OnSuccessResponse_70(); } static void OnFailureCallback_71(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_71(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_71(status); } static void OnSuccessCallback_71(void * context, int32_t int32s) @@ -35010,7 +35592,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_72(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_72(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_72(status); } static void OnSuccessCallback_72(void * context, int64_t int64s) @@ -35020,14 +35602,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_73(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_73(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_73(status); } static void OnSuccessCallback_73(void * context) { (static_cast(context))->OnSuccessResponse_73(); } static void OnFailureCallback_74(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_74(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_74(status); } static void OnSuccessCallback_74(void * context, int64_t int64s) @@ -35037,14 +35619,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_75(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_75(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_75(status); } static void OnSuccessCallback_75(void * context) { (static_cast(context))->OnSuccessResponse_75(); } static void OnFailureCallback_76(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_76(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_76(status); } static void OnSuccessCallback_76(void * context, int64_t int64s) @@ -35054,14 +35636,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_77(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_77(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_77(status); } static void OnSuccessCallback_77(void * context) { (static_cast(context))->OnSuccessResponse_77(); } static void OnFailureCallback_78(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_78(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_78(status); } static void OnSuccessCallback_78(void * context, int64_t int64s) @@ -35071,7 +35653,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_79(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_79(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_79(status); } static void OnSuccessCallback_79(void * context, float floatSingle) @@ -35081,14 +35663,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_80(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_80(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_80(status); } static void OnSuccessCallback_80(void * context) { (static_cast(context))->OnSuccessResponse_80(); } static void OnFailureCallback_81(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_81(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_81(status); } static void OnSuccessCallback_81(void * context, float floatSingle) @@ -35098,14 +35680,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_82(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_82(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_82(status); } static void OnSuccessCallback_82(void * context) { (static_cast(context))->OnSuccessResponse_82(); } static void OnFailureCallback_83(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_83(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_83(status); } static void OnSuccessCallback_83(void * context, float floatSingle) @@ -35115,14 +35697,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_84(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_84(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_84(status); } static void OnSuccessCallback_84(void * context) { (static_cast(context))->OnSuccessResponse_84(); } static void OnFailureCallback_85(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_85(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_85(status); } static void OnSuccessCallback_85(void * context, float floatSingle) @@ -35132,14 +35714,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_86(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_86(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_86(status); } static void OnSuccessCallback_86(void * context) { (static_cast(context))->OnSuccessResponse_86(); } static void OnFailureCallback_87(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_87(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_87(status); } static void OnSuccessCallback_87(void * context, float floatSingle) @@ -35149,7 +35731,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_88(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_88(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_88(status); } static void OnSuccessCallback_88(void * context, double floatDouble) @@ -35159,14 +35741,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_89(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_89(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_89(status); } static void OnSuccessCallback_89(void * context) { (static_cast(context))->OnSuccessResponse_89(); } static void OnFailureCallback_90(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_90(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_90(status); } static void OnSuccessCallback_90(void * context, double floatDouble) @@ -35176,14 +35758,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_91(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_91(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_91(status); } static void OnSuccessCallback_91(void * context) { (static_cast(context))->OnSuccessResponse_91(); } static void OnFailureCallback_92(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_92(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_92(status); } static void OnSuccessCallback_92(void * context, double floatDouble) @@ -35193,14 +35775,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_93(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_93(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_93(status); } static void OnSuccessCallback_93(void * context) { (static_cast(context))->OnSuccessResponse_93(); } static void OnFailureCallback_94(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_94(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_94(status); } static void OnSuccessCallback_94(void * context, double floatDouble) @@ -35210,14 +35792,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_95(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_95(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_95(status); } static void OnSuccessCallback_95(void * context) { (static_cast(context))->OnSuccessResponse_95(); } static void OnFailureCallback_96(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_96(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_96(status); } static void OnSuccessCallback_96(void * context, double floatDouble) @@ -35227,7 +35809,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_97(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_97(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_97(status); } static void OnSuccessCallback_97(void * context, uint8_t enum8) @@ -35237,14 +35819,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_98(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_98(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_98(status); } static void OnSuccessCallback_98(void * context) { (static_cast(context))->OnSuccessResponse_98(); } static void OnFailureCallback_99(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_99(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_99(status); } static void OnSuccessCallback_99(void * context, uint8_t enum8) @@ -35254,14 +35836,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_100(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_100(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_100(status); } static void OnSuccessCallback_100(void * context) { (static_cast(context))->OnSuccessResponse_100(); } static void OnFailureCallback_101(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_101(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_101(status); } static void OnSuccessCallback_101(void * context, uint8_t enum8) @@ -35271,7 +35853,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_102(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_102(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_102(status); } static void OnSuccessCallback_102(void * context, uint16_t enum16) @@ -35281,14 +35863,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_103(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_103(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_103(status); } static void OnSuccessCallback_103(void * context) { (static_cast(context))->OnSuccessResponse_103(); } static void OnFailureCallback_104(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_104(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_104(status); } static void OnSuccessCallback_104(void * context, uint16_t enum16) @@ -35298,14 +35880,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_105(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_105(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_105(status); } static void OnSuccessCallback_105(void * context) { (static_cast(context))->OnSuccessResponse_105(); } static void OnFailureCallback_106(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_106(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_106(status); } static void OnSuccessCallback_106(void * context, uint16_t enum16) @@ -35315,7 +35897,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_107(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_107(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_107(status); } static void OnSuccessCallback_107(void * context, chip::ByteSpan octetString) @@ -35325,14 +35907,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_108(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_108(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_108(status); } static void OnSuccessCallback_108(void * context) { (static_cast(context))->OnSuccessResponse_108(); } static void OnFailureCallback_109(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_109(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_109(status); } static void OnSuccessCallback_109(void * context, chip::ByteSpan octetString) @@ -35342,14 +35924,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_110(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_110(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_110(status); } static void OnSuccessCallback_110(void * context) { (static_cast(context))->OnSuccessResponse_110(); } static void OnFailureCallback_111(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_111(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_111(status); } static void OnSuccessCallback_111(void * context, chip::ByteSpan octetString) @@ -35359,14 +35941,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_112(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_112(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_112(status); } static void OnSuccessCallback_112(void * context) { (static_cast(context))->OnSuccessResponse_112(); } static void OnFailureCallback_113(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_113(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_113(status); } static void OnSuccessCallback_113(void * context, chip::ByteSpan octetString) @@ -35376,14 +35958,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_114(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_114(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_114(status); } static void OnSuccessCallback_114(void * context) { (static_cast(context))->OnSuccessResponse_114(); } static void OnFailureCallback_115(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_115(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_115(status); } static void OnSuccessCallback_115(void * context, chip::ByteSpan longOctetString) @@ -35393,14 +35975,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_116(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_116(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_116(status); } static void OnSuccessCallback_116(void * context) { (static_cast(context))->OnSuccessResponse_116(); } static void OnFailureCallback_117(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_117(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_117(status); } static void OnSuccessCallback_117(void * context, chip::ByteSpan longOctetString) @@ -35410,14 +35992,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_118(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_118(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_118(status); } static void OnSuccessCallback_118(void * context) { (static_cast(context))->OnSuccessResponse_118(); } static void OnFailureCallback_119(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_119(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_119(status); } static void OnSuccessCallback_119(void * context, chip::CharSpan charString) @@ -35427,14 +36009,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_120(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_120(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_120(status); } static void OnSuccessCallback_120(void * context) { (static_cast(context))->OnSuccessResponse_120(); } static void OnFailureCallback_121(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_121(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_121(status); } static void OnSuccessCallback_121(void * context, chip::CharSpan charString) @@ -35444,14 +36026,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_122(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_122(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_122(status); } static void OnSuccessCallback_122(void * context) { (static_cast(context))->OnSuccessResponse_122(); } static void OnFailureCallback_123(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_123(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_123(status); } static void OnSuccessCallback_123(void * context, chip::CharSpan charString) @@ -35461,14 +36043,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_124(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_124(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_124(status); } static void OnSuccessCallback_124(void * context) { (static_cast(context))->OnSuccessResponse_124(); } static void OnFailureCallback_125(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_125(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_125(status); } static void OnSuccessCallback_125(void * context, chip::CharSpan longCharString) @@ -35478,14 +36060,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_126(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_126(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_126(status); } static void OnSuccessCallback_126(void * context) { (static_cast(context))->OnSuccessResponse_126(); } static void OnFailureCallback_127(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_127(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_127(status); } static void OnSuccessCallback_127(void * context, chip::CharSpan longCharString) @@ -35495,14 +36077,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_128(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_128(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_128(status); } static void OnSuccessCallback_128(void * context) { (static_cast(context))->OnSuccessResponse_128(); } static void OnFailureCallback_129(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_129(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_129(status); } static void OnSuccessCallback_129(void * context, @@ -35513,7 +36095,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_130(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_130(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_130(status); } static void OnSuccessCallback_130(void * context, uint64_t epochUs) @@ -35523,14 +36105,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_131(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_131(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_131(status); } static void OnSuccessCallback_131(void * context) { (static_cast(context))->OnSuccessResponse_131(); } static void OnFailureCallback_132(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_132(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_132(status); } static void OnSuccessCallback_132(void * context, uint64_t epochUs) @@ -35540,14 +36122,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_133(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_133(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_133(status); } static void OnSuccessCallback_133(void * context) { (static_cast(context))->OnSuccessResponse_133(); } static void OnFailureCallback_134(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_134(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_134(status); } static void OnSuccessCallback_134(void * context, uint64_t epochUs) @@ -35557,7 +36139,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_135(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_135(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_135(status); } static void OnSuccessCallback_135(void * context, uint32_t epochS) @@ -35567,14 +36149,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_136(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_136(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_136(status); } static void OnSuccessCallback_136(void * context) { (static_cast(context))->OnSuccessResponse_136(); } static void OnFailureCallback_137(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_137(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_137(status); } static void OnSuccessCallback_137(void * context, uint32_t epochS) @@ -35584,14 +36166,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_138(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_138(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_138(status); } static void OnSuccessCallback_138(void * context) { (static_cast(context))->OnSuccessResponse_138(); } static void OnFailureCallback_139(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_139(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_139(status); } static void OnSuccessCallback_139(void * context, uint32_t epochS) @@ -35601,7 +36183,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_140(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_140(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_140(status); } static void OnSuccessCallback_140(void * context, bool unsupported) @@ -35611,14 +36193,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_141(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_141(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_141(status); } static void OnSuccessCallback_141(void * context) { (static_cast(context))->OnSuccessResponse_141(); } static void OnFailureCallback_144(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_144(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_144(status); } static void OnSuccessCallback_144(void * context, chip::VendorId vendorId) @@ -35628,14 +36210,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_145(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_145(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_145(status); } static void OnSuccessCallback_145(void * context) { (static_cast(context))->OnSuccessResponse_145(); } static void OnFailureCallback_146(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_146(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_146(status); } static void OnSuccessCallback_146(void * context, chip::VendorId vendorId) @@ -35645,21 +36227,21 @@ class TestCluster : public TestCommand static void OnFailureCallback_147(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_147(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_147(status); } static void OnSuccessCallback_147(void * context) { (static_cast(context))->OnSuccessResponse_147(); } static void OnFailureCallback_164(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_164(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_164(status); } static void OnSuccessCallback_164(void * context) { (static_cast(context))->OnSuccessResponse_164(); } static void OnFailureCallback_165(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_165(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_165(status); } static void OnSuccessCallback_165(void * context, const chip::app::DataModel::DecodableList & listInt8u) @@ -35669,14 +36251,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_166(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_166(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_166(status); } static void OnSuccessCallback_166(void * context) { (static_cast(context))->OnSuccessResponse_166(); } static void OnFailureCallback_167(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_167(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_167(status); } static void OnSuccessCallback_167(void * context, const chip::app::DataModel::DecodableList & listOctetString) @@ -35686,14 +36268,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_168(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_168(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_168(status); } static void OnSuccessCallback_168(void * context) { (static_cast(context))->OnSuccessResponse_168(); } static void OnFailureCallback_169(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_169(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_169(status); } static void OnSuccessCallback_169( @@ -35706,14 +36288,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_172(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_172(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_172(status); } static void OnSuccessCallback_172(void * context) { (static_cast(context))->OnSuccessResponse_172(); } static void OnFailureCallback_173(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_173(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_173(status); } static void OnSuccessCallback_173(void * context, const chip::app::DataModel::Nullable & nullableBoolean) @@ -35723,14 +36305,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_174(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_174(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_174(status); } static void OnSuccessCallback_174(void * context) { (static_cast(context))->OnSuccessResponse_174(); } static void OnFailureCallback_175(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_175(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_175(status); } static void OnSuccessCallback_175(void * context, const chip::app::DataModel::Nullable & nullableBoolean) @@ -35740,14 +36322,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_176(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_176(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_176(status); } static void OnSuccessCallback_176(void * context) { (static_cast(context))->OnSuccessResponse_176(); } static void OnFailureCallback_177(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_177(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_177(status); } static void OnSuccessCallback_177(void * context, const chip::app::DataModel::Nullable & nullableBitmap8) @@ -35757,14 +36339,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_178(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_178(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_178(status); } static void OnSuccessCallback_178(void * context) { (static_cast(context))->OnSuccessResponse_178(); } static void OnFailureCallback_179(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_179(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_179(status); } static void OnSuccessCallback_179(void * context, const chip::app::DataModel::Nullable & nullableBitmap8) @@ -35774,14 +36356,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_180(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_180(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_180(status); } static void OnSuccessCallback_180(void * context) { (static_cast(context))->OnSuccessResponse_180(); } static void OnFailureCallback_181(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_181(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_181(status); } static void OnSuccessCallback_181(void * context, const chip::app::DataModel::Nullable & nullableBitmap8) @@ -35791,14 +36373,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_182(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_182(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_182(status); } static void OnSuccessCallback_182(void * context) { (static_cast(context))->OnSuccessResponse_182(); } static void OnFailureCallback_183(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_183(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_183(status); } static void OnSuccessCallback_183(void * context, const chip::app::DataModel::Nullable & nullableBitmap16) @@ -35808,14 +36390,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_184(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_184(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_184(status); } static void OnSuccessCallback_184(void * context) { (static_cast(context))->OnSuccessResponse_184(); } static void OnFailureCallback_185(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_185(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_185(status); } static void OnSuccessCallback_185(void * context, const chip::app::DataModel::Nullable & nullableBitmap16) @@ -35825,14 +36407,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_186(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_186(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_186(status); } static void OnSuccessCallback_186(void * context) { (static_cast(context))->OnSuccessResponse_186(); } static void OnFailureCallback_187(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_187(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_187(status); } static void OnSuccessCallback_187(void * context, const chip::app::DataModel::Nullable & nullableBitmap16) @@ -35842,14 +36424,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_188(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_188(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_188(status); } static void OnSuccessCallback_188(void * context) { (static_cast(context))->OnSuccessResponse_188(); } static void OnFailureCallback_189(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_189(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_189(status); } static void OnSuccessCallback_189(void * context, const chip::app::DataModel::Nullable & nullableBitmap32) @@ -35859,14 +36441,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_190(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_190(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_190(status); } static void OnSuccessCallback_190(void * context) { (static_cast(context))->OnSuccessResponse_190(); } static void OnFailureCallback_191(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_191(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_191(status); } static void OnSuccessCallback_191(void * context, const chip::app::DataModel::Nullable & nullableBitmap32) @@ -35876,14 +36458,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_192(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_192(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_192(status); } static void OnSuccessCallback_192(void * context) { (static_cast(context))->OnSuccessResponse_192(); } static void OnFailureCallback_193(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_193(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_193(status); } static void OnSuccessCallback_193(void * context, const chip::app::DataModel::Nullable & nullableBitmap32) @@ -35893,14 +36475,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_194(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_194(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_194(status); } static void OnSuccessCallback_194(void * context) { (static_cast(context))->OnSuccessResponse_194(); } static void OnFailureCallback_195(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_195(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_195(status); } static void OnSuccessCallback_195(void * context, const chip::app::DataModel::Nullable & nullableBitmap64) @@ -35910,14 +36492,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_196(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_196(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_196(status); } static void OnSuccessCallback_196(void * context) { (static_cast(context))->OnSuccessResponse_196(); } static void OnFailureCallback_197(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_197(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_197(status); } static void OnSuccessCallback_197(void * context, const chip::app::DataModel::Nullable & nullableBitmap64) @@ -35927,14 +36509,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_198(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_198(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_198(status); } static void OnSuccessCallback_198(void * context) { (static_cast(context))->OnSuccessResponse_198(); } static void OnFailureCallback_199(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_199(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_199(status); } static void OnSuccessCallback_199(void * context, const chip::app::DataModel::Nullable & nullableBitmap64) @@ -35944,14 +36526,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_200(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_200(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_200(status); } static void OnSuccessCallback_200(void * context) { (static_cast(context))->OnSuccessResponse_200(); } static void OnFailureCallback_201(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_201(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_201(status); } static void OnSuccessCallback_201(void * context, const chip::app::DataModel::Nullable & nullableInt8u) @@ -35961,14 +36543,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_202(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_202(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_202(status); } static void OnSuccessCallback_202(void * context) { (static_cast(context))->OnSuccessResponse_202(); } static void OnFailureCallback_203(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_203(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_203(status); } static void OnSuccessCallback_203(void * context, const chip::app::DataModel::Nullable & nullableInt8u) @@ -35978,14 +36560,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_204(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_204(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_204(status); } static void OnSuccessCallback_204(void * context) { (static_cast(context))->OnSuccessResponse_204(); } static void OnFailureCallback_205(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_205(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_205(status); } static void OnSuccessCallback_205(void * context, const chip::app::DataModel::Nullable & nullableInt8u) @@ -35995,14 +36577,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_206(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_206(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_206(status); } static void OnSuccessCallback_206(void * context) { (static_cast(context))->OnSuccessResponse_206(); } static void OnFailureCallback_207(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_207(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_207(status); } static void OnSuccessCallback_207(void * context, const chip::app::DataModel::Nullable & nullableInt16u) @@ -36012,14 +36594,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_208(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_208(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_208(status); } static void OnSuccessCallback_208(void * context) { (static_cast(context))->OnSuccessResponse_208(); } static void OnFailureCallback_209(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_209(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_209(status); } static void OnSuccessCallback_209(void * context, const chip::app::DataModel::Nullable & nullableInt16u) @@ -36029,14 +36611,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_210(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_210(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_210(status); } static void OnSuccessCallback_210(void * context) { (static_cast(context))->OnSuccessResponse_210(); } static void OnFailureCallback_211(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_211(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_211(status); } static void OnSuccessCallback_211(void * context, const chip::app::DataModel::Nullable & nullableInt16u) @@ -36046,14 +36628,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_212(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_212(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_212(status); } static void OnSuccessCallback_212(void * context) { (static_cast(context))->OnSuccessResponse_212(); } static void OnFailureCallback_213(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_213(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_213(status); } static void OnSuccessCallback_213(void * context, const chip::app::DataModel::Nullable & nullableInt32u) @@ -36063,14 +36645,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_214(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_214(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_214(status); } static void OnSuccessCallback_214(void * context) { (static_cast(context))->OnSuccessResponse_214(); } static void OnFailureCallback_215(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_215(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_215(status); } static void OnSuccessCallback_215(void * context, const chip::app::DataModel::Nullable & nullableInt32u) @@ -36080,14 +36662,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_216(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_216(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_216(status); } static void OnSuccessCallback_216(void * context) { (static_cast(context))->OnSuccessResponse_216(); } static void OnFailureCallback_217(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_217(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_217(status); } static void OnSuccessCallback_217(void * context, const chip::app::DataModel::Nullable & nullableInt32u) @@ -36097,14 +36679,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_218(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_218(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_218(status); } static void OnSuccessCallback_218(void * context) { (static_cast(context))->OnSuccessResponse_218(); } static void OnFailureCallback_219(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_219(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_219(status); } static void OnSuccessCallback_219(void * context, const chip::app::DataModel::Nullable & nullableInt64u) @@ -36114,14 +36696,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_220(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_220(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_220(status); } static void OnSuccessCallback_220(void * context) { (static_cast(context))->OnSuccessResponse_220(); } static void OnFailureCallback_221(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_221(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_221(status); } static void OnSuccessCallback_221(void * context, const chip::app::DataModel::Nullable & nullableInt64u) @@ -36131,14 +36713,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_222(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_222(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_222(status); } static void OnSuccessCallback_222(void * context) { (static_cast(context))->OnSuccessResponse_222(); } static void OnFailureCallback_223(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_223(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_223(status); } static void OnSuccessCallback_223(void * context, const chip::app::DataModel::Nullable & nullableInt64u) @@ -36148,14 +36730,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_224(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_224(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_224(status); } static void OnSuccessCallback_224(void * context) { (static_cast(context))->OnSuccessResponse_224(); } static void OnFailureCallback_225(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_225(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_225(status); } static void OnSuccessCallback_225(void * context, const chip::app::DataModel::Nullable & nullableInt8s) @@ -36165,14 +36747,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_226(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_226(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_226(status); } static void OnSuccessCallback_226(void * context) { (static_cast(context))->OnSuccessResponse_226(); } static void OnFailureCallback_227(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_227(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_227(status); } static void OnSuccessCallback_227(void * context, const chip::app::DataModel::Nullable & nullableInt8s) @@ -36182,14 +36764,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_228(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_228(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_228(status); } static void OnSuccessCallback_228(void * context) { (static_cast(context))->OnSuccessResponse_228(); } static void OnFailureCallback_229(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_229(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_229(status); } static void OnSuccessCallback_229(void * context, const chip::app::DataModel::Nullable & nullableInt8s) @@ -36199,14 +36781,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_230(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_230(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_230(status); } static void OnSuccessCallback_230(void * context) { (static_cast(context))->OnSuccessResponse_230(); } static void OnFailureCallback_231(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_231(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_231(status); } static void OnSuccessCallback_231(void * context, const chip::app::DataModel::Nullable & nullableInt16s) @@ -36216,14 +36798,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_232(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_232(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_232(status); } static void OnSuccessCallback_232(void * context) { (static_cast(context))->OnSuccessResponse_232(); } static void OnFailureCallback_233(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_233(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_233(status); } static void OnSuccessCallback_233(void * context, const chip::app::DataModel::Nullable & nullableInt16s) @@ -36233,14 +36815,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_234(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_234(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_234(status); } static void OnSuccessCallback_234(void * context) { (static_cast(context))->OnSuccessResponse_234(); } static void OnFailureCallback_235(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_235(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_235(status); } static void OnSuccessCallback_235(void * context, const chip::app::DataModel::Nullable & nullableInt16s) @@ -36250,14 +36832,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_236(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_236(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_236(status); } static void OnSuccessCallback_236(void * context) { (static_cast(context))->OnSuccessResponse_236(); } static void OnFailureCallback_237(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_237(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_237(status); } static void OnSuccessCallback_237(void * context, const chip::app::DataModel::Nullable & nullableInt32s) @@ -36267,14 +36849,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_238(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_238(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_238(status); } static void OnSuccessCallback_238(void * context) { (static_cast(context))->OnSuccessResponse_238(); } static void OnFailureCallback_239(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_239(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_239(status); } static void OnSuccessCallback_239(void * context, const chip::app::DataModel::Nullable & nullableInt32s) @@ -36284,14 +36866,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_240(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_240(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_240(status); } static void OnSuccessCallback_240(void * context) { (static_cast(context))->OnSuccessResponse_240(); } static void OnFailureCallback_241(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_241(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_241(status); } static void OnSuccessCallback_241(void * context, const chip::app::DataModel::Nullable & nullableInt32s) @@ -36301,14 +36883,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_242(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_242(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_242(status); } static void OnSuccessCallback_242(void * context) { (static_cast(context))->OnSuccessResponse_242(); } static void OnFailureCallback_243(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_243(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_243(status); } static void OnSuccessCallback_243(void * context, const chip::app::DataModel::Nullable & nullableInt64s) @@ -36318,14 +36900,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_244(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_244(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_244(status); } static void OnSuccessCallback_244(void * context) { (static_cast(context))->OnSuccessResponse_244(); } static void OnFailureCallback_245(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_245(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_245(status); } static void OnSuccessCallback_245(void * context, const chip::app::DataModel::Nullable & nullableInt64s) @@ -36335,14 +36917,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_246(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_246(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_246(status); } static void OnSuccessCallback_246(void * context) { (static_cast(context))->OnSuccessResponse_246(); } static void OnFailureCallback_247(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_247(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_247(status); } static void OnSuccessCallback_247(void * context, const chip::app::DataModel::Nullable & nullableInt64s) @@ -36352,14 +36934,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_248(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_248(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_248(status); } static void OnSuccessCallback_248(void * context) { (static_cast(context))->OnSuccessResponse_248(); } static void OnFailureCallback_249(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_249(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_249(status); } static void OnSuccessCallback_249(void * context, const chip::app::DataModel::Nullable & nullableFloatSingle) @@ -36369,14 +36951,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_250(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_250(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_250(status); } static void OnSuccessCallback_250(void * context) { (static_cast(context))->OnSuccessResponse_250(); } static void OnFailureCallback_251(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_251(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_251(status); } static void OnSuccessCallback_251(void * context, const chip::app::DataModel::Nullable & nullableFloatSingle) @@ -36386,14 +36968,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_252(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_252(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_252(status); } static void OnSuccessCallback_252(void * context) { (static_cast(context))->OnSuccessResponse_252(); } static void OnFailureCallback_253(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_253(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_253(status); } static void OnSuccessCallback_253(void * context, const chip::app::DataModel::Nullable & nullableFloatSingle) @@ -36403,14 +36985,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_254(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_254(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_254(status); } static void OnSuccessCallback_254(void * context) { (static_cast(context))->OnSuccessResponse_254(); } static void OnFailureCallback_255(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_255(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_255(status); } static void OnSuccessCallback_255(void * context, const chip::app::DataModel::Nullable & nullableFloatSingle) @@ -36420,14 +37002,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_256(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_256(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_256(status); } static void OnSuccessCallback_256(void * context) { (static_cast(context))->OnSuccessResponse_256(); } static void OnFailureCallback_257(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_257(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_257(status); } static void OnSuccessCallback_257(void * context, const chip::app::DataModel::Nullable & nullableFloatSingle) @@ -36437,14 +37019,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_258(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_258(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_258(status); } static void OnSuccessCallback_258(void * context) { (static_cast(context))->OnSuccessResponse_258(); } static void OnFailureCallback_259(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_259(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_259(status); } static void OnSuccessCallback_259(void * context, const chip::app::DataModel::Nullable & nullableFloatDouble) @@ -36454,14 +37036,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_260(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_260(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_260(status); } static void OnSuccessCallback_260(void * context) { (static_cast(context))->OnSuccessResponse_260(); } static void OnFailureCallback_261(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_261(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_261(status); } static void OnSuccessCallback_261(void * context, const chip::app::DataModel::Nullable & nullableFloatDouble) @@ -36471,14 +37053,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_262(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_262(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_262(status); } static void OnSuccessCallback_262(void * context) { (static_cast(context))->OnSuccessResponse_262(); } static void OnFailureCallback_263(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_263(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_263(status); } static void OnSuccessCallback_263(void * context, const chip::app::DataModel::Nullable & nullableFloatDouble) @@ -36488,14 +37070,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_264(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_264(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_264(status); } static void OnSuccessCallback_264(void * context) { (static_cast(context))->OnSuccessResponse_264(); } static void OnFailureCallback_265(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_265(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_265(status); } static void OnSuccessCallback_265(void * context, const chip::app::DataModel::Nullable & nullableFloatDouble) @@ -36505,14 +37087,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_266(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_266(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_266(status); } static void OnSuccessCallback_266(void * context) { (static_cast(context))->OnSuccessResponse_266(); } static void OnFailureCallback_267(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_267(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_267(status); } static void OnSuccessCallback_267(void * context, const chip::app::DataModel::Nullable & nullableFloatDouble) @@ -36522,14 +37104,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_268(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_268(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_268(status); } static void OnSuccessCallback_268(void * context) { (static_cast(context))->OnSuccessResponse_268(); } static void OnFailureCallback_269(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_269(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_269(status); } static void OnSuccessCallback_269(void * context, const chip::app::DataModel::Nullable & nullableEnum8) @@ -36539,14 +37121,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_270(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_270(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_270(status); } static void OnSuccessCallback_270(void * context) { (static_cast(context))->OnSuccessResponse_270(); } static void OnFailureCallback_271(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_271(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_271(status); } static void OnSuccessCallback_271(void * context, const chip::app::DataModel::Nullable & nullableEnum8) @@ -36556,14 +37138,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_272(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_272(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_272(status); } static void OnSuccessCallback_272(void * context) { (static_cast(context))->OnSuccessResponse_272(); } static void OnFailureCallback_273(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_273(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_273(status); } static void OnSuccessCallback_273(void * context, const chip::app::DataModel::Nullable & nullableEnum8) @@ -36573,14 +37155,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_274(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_274(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_274(status); } static void OnSuccessCallback_274(void * context) { (static_cast(context))->OnSuccessResponse_274(); } static void OnFailureCallback_275(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_275(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_275(status); } static void OnSuccessCallback_275(void * context, const chip::app::DataModel::Nullable & nullableEnum16) @@ -36590,14 +37172,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_276(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_276(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_276(status); } static void OnSuccessCallback_276(void * context) { (static_cast(context))->OnSuccessResponse_276(); } static void OnFailureCallback_277(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_277(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_277(status); } static void OnSuccessCallback_277(void * context, const chip::app::DataModel::Nullable & nullableEnum16) @@ -36607,14 +37189,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_278(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_278(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_278(status); } static void OnSuccessCallback_278(void * context) { (static_cast(context))->OnSuccessResponse_278(); } static void OnFailureCallback_279(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_279(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_279(status); } static void OnSuccessCallback_279(void * context, const chip::app::DataModel::Nullable & nullableEnum16) @@ -36624,7 +37206,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_280(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_280(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_280(status); } static void OnSuccessCallback_280(void * context, const chip::app::DataModel::Nullable & nullableOctetString) @@ -36634,14 +37216,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_281(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_281(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_281(status); } static void OnSuccessCallback_281(void * context) { (static_cast(context))->OnSuccessResponse_281(); } static void OnFailureCallback_282(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_282(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_282(status); } static void OnSuccessCallback_282(void * context, const chip::app::DataModel::Nullable & nullableOctetString) @@ -36651,14 +37233,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_283(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_283(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_283(status); } static void OnSuccessCallback_283(void * context) { (static_cast(context))->OnSuccessResponse_283(); } static void OnFailureCallback_284(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_284(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_284(status); } static void OnSuccessCallback_284(void * context, const chip::app::DataModel::Nullable & nullableOctetString) @@ -36668,14 +37250,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_285(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_285(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_285(status); } static void OnSuccessCallback_285(void * context) { (static_cast(context))->OnSuccessResponse_285(); } static void OnFailureCallback_286(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_286(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_286(status); } static void OnSuccessCallback_286(void * context, const chip::app::DataModel::Nullable & nullableOctetString) @@ -36685,7 +37267,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_287(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_287(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_287(status); } static void OnSuccessCallback_287(void * context, const chip::app::DataModel::Nullable & nullableCharString) @@ -36695,14 +37277,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_288(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_288(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_288(status); } static void OnSuccessCallback_288(void * context) { (static_cast(context))->OnSuccessResponse_288(); } static void OnFailureCallback_289(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_289(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_289(status); } static void OnSuccessCallback_289(void * context, const chip::app::DataModel::Nullable & nullableCharString) @@ -36712,14 +37294,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_290(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_290(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_290(status); } static void OnSuccessCallback_290(void * context) { (static_cast(context))->OnSuccessResponse_290(); } static void OnFailureCallback_291(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_291(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_291(status); } static void OnSuccessCallback_291(void * context, const chip::app::DataModel::Nullable & nullableCharString) @@ -36729,14 +37311,14 @@ class TestCluster : public TestCommand static void OnFailureCallback_292(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_292(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_292(status); } static void OnSuccessCallback_292(void * context) { (static_cast(context))->OnSuccessResponse_292(); } static void OnFailureCallback_293(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_293(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_293(status); } static void OnSuccessCallback_293(void * context, const chip::app::DataModel::Nullable & nullableCharString) @@ -36746,7 +37328,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_294(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_294(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_294(status); } static void OnSuccessCallback_294(void * context, const chip::app::DataModel::DecodableList & listInt8u) @@ -36756,7 +37338,7 @@ class TestCluster : public TestCommand static void OnFailureCallback_295(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_295(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_295(status); } static void OnSuccessCallback_295(void * context, const chip::app::DataModel::DecodableList & listInt8u) @@ -36793,7 +37375,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -36816,7 +37398,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) + void OnFailureResponse_2(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_INVALID_COMMAND)); NextTest(); @@ -36843,7 +37425,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint8_t returnValue) { @@ -36873,7 +37455,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint8_t returnValue) { @@ -36903,7 +37485,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) + void OnFailureResponse_5(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_INVALID_COMMAND)); NextTest(); @@ -36917,11 +37499,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_6, - OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(bool boolean) { @@ -36944,7 +37527,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7() { NextTest(); } @@ -36954,11 +37537,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_8, - OnFailureCallback_8); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_8, OnFailureCallback_8)); + return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(bool boolean) { @@ -36981,7 +37565,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9() { NextTest(); } @@ -36991,11 +37575,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_10, - OnFailureCallback_10); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_10, OnFailureCallback_10)); + return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10(bool boolean) { @@ -37010,11 +37595,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_11, - OnFailureCallback_11); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_11, OnFailureCallback_11)); + return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11(uint8_t bitmap8) { @@ -37037,7 +37623,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_12(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_12() { NextTest(); } @@ -37047,11 +37633,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_13, - OnFailureCallback_13); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_13, OnFailureCallback_13)); + return CHIP_NO_ERROR; } - void OnFailureResponse_13(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_13(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_13(uint8_t bitmap8) { @@ -37074,7 +37661,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_14(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_14(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_14() { NextTest(); } @@ -37084,11 +37671,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_15, - OnFailureCallback_15); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_15, OnFailureCallback_15)); + return CHIP_NO_ERROR; } - void OnFailureResponse_15(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_15(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_15(uint8_t bitmap8) { @@ -37103,11 +37691,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_16, - OnFailureCallback_16); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_16, OnFailureCallback_16)); + return CHIP_NO_ERROR; } - void OnFailureResponse_16(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_16(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_16(uint16_t bitmap16) { @@ -37130,7 +37719,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_17(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_17(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_17() { NextTest(); } @@ -37140,11 +37729,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_18, - OnFailureCallback_18); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_18, OnFailureCallback_18)); + return CHIP_NO_ERROR; } - void OnFailureResponse_18(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_18(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_18(uint16_t bitmap16) { @@ -37167,7 +37757,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_19(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_19(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_19() { NextTest(); } @@ -37177,11 +37767,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_20, - OnFailureCallback_20); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_20, OnFailureCallback_20)); + return CHIP_NO_ERROR; } - void OnFailureResponse_20(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_20(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_20(uint16_t bitmap16) { @@ -37196,11 +37787,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_21, - OnFailureCallback_21); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_21, OnFailureCallback_21)); + return CHIP_NO_ERROR; } - void OnFailureResponse_21(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_21(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_21(uint32_t bitmap32) { @@ -37223,7 +37815,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_22(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_22(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_22() { NextTest(); } @@ -37233,11 +37825,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_23, - OnFailureCallback_23); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_23, OnFailureCallback_23)); + return CHIP_NO_ERROR; } - void OnFailureResponse_23(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_23(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_23(uint32_t bitmap32) { @@ -37260,7 +37853,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_24(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_24(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_24() { NextTest(); } @@ -37270,11 +37863,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_25, - OnFailureCallback_25); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_25, OnFailureCallback_25)); + return CHIP_NO_ERROR; } - void OnFailureResponse_25(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_25(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_25(uint32_t bitmap32) { @@ -37289,11 +37883,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_26, - OnFailureCallback_26); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_26, OnFailureCallback_26)); + return CHIP_NO_ERROR; } - void OnFailureResponse_26(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_26(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_26(uint64_t bitmap64) { @@ -37316,7 +37911,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_27(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_27(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_27() { NextTest(); } @@ -37326,11 +37921,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_28, - OnFailureCallback_28); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_28, OnFailureCallback_28)); + return CHIP_NO_ERROR; } - void OnFailureResponse_28(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_28(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_28(uint64_t bitmap64) { @@ -37353,7 +37949,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_29(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_29(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_29() { NextTest(); } @@ -37363,11 +37959,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_30, - OnFailureCallback_30); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_30, OnFailureCallback_30)); + return CHIP_NO_ERROR; } - void OnFailureResponse_30(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_30(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_30(uint64_t bitmap64) { @@ -37382,11 +37979,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_31, - OnFailureCallback_31); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_31, OnFailureCallback_31)); + return CHIP_NO_ERROR; } - void OnFailureResponse_31(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_31(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_31(uint8_t int8u) { @@ -37409,7 +38007,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_32(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_32(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_32() { NextTest(); } @@ -37419,11 +38017,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_33, - OnFailureCallback_33); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_33, OnFailureCallback_33)); + return CHIP_NO_ERROR; } - void OnFailureResponse_33(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_33(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_33(uint8_t int8u) { @@ -37446,7 +38045,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_34(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_34(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_34() { NextTest(); } @@ -37456,11 +38055,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_35, - OnFailureCallback_35); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_35, OnFailureCallback_35)); + return CHIP_NO_ERROR; } - void OnFailureResponse_35(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_35(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_35(uint8_t int8u) { @@ -37475,11 +38075,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_36, - OnFailureCallback_36); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_36, OnFailureCallback_36)); + return CHIP_NO_ERROR; } - void OnFailureResponse_36(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_36(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_36(uint16_t int16u) { @@ -37502,7 +38103,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_37(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_37(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_37() { NextTest(); } @@ -37512,11 +38113,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_38, - OnFailureCallback_38); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_38, OnFailureCallback_38)); + return CHIP_NO_ERROR; } - void OnFailureResponse_38(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_38(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_38(uint16_t int16u) { @@ -37539,7 +38141,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_39(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_39(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_39() { NextTest(); } @@ -37549,11 +38151,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_40, - OnFailureCallback_40); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_40, OnFailureCallback_40)); + return CHIP_NO_ERROR; } - void OnFailureResponse_40(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_40(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_40(uint16_t int16u) { @@ -37568,11 +38171,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_41, - OnFailureCallback_41); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_41, OnFailureCallback_41)); + return CHIP_NO_ERROR; } - void OnFailureResponse_41(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_41(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_41(uint32_t int32u) { @@ -37595,7 +38199,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_42(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_42(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_42() { NextTest(); } @@ -37605,11 +38209,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_43, - OnFailureCallback_43); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_43, OnFailureCallback_43)); + return CHIP_NO_ERROR; } - void OnFailureResponse_43(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_43(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_43(uint32_t int32u) { @@ -37632,7 +38237,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_44(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_44(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_44() { NextTest(); } @@ -37642,11 +38247,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_45, - OnFailureCallback_45); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_45, OnFailureCallback_45)); + return CHIP_NO_ERROR; } - void OnFailureResponse_45(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_45(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_45(uint32_t int32u) { @@ -37661,11 +38267,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_46, - OnFailureCallback_46); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_46, OnFailureCallback_46)); + return CHIP_NO_ERROR; } - void OnFailureResponse_46(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_46(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_46(uint64_t int64u) { @@ -37688,7 +38295,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_47(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_47(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_47() { NextTest(); } @@ -37698,11 +38305,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_48, - OnFailureCallback_48); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_48, OnFailureCallback_48)); + return CHIP_NO_ERROR; } - void OnFailureResponse_48(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_48(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_48(uint64_t int64u) { @@ -37725,7 +38333,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_49(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_49(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_49() { NextTest(); } @@ -37735,11 +38343,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_50, - OnFailureCallback_50); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_50, OnFailureCallback_50)); + return CHIP_NO_ERROR; } - void OnFailureResponse_50(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_50(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_50(uint64_t int64u) { @@ -37754,11 +38363,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_51, - OnFailureCallback_51); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_51, OnFailureCallback_51)); + return CHIP_NO_ERROR; } - void OnFailureResponse_51(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_51(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_51(int8_t int8s) { @@ -37781,7 +38391,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_52(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_52(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_52() { NextTest(); } @@ -37791,11 +38401,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_53, - OnFailureCallback_53); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_53, OnFailureCallback_53)); + return CHIP_NO_ERROR; } - void OnFailureResponse_53(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_53(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_53(int8_t int8s) { @@ -37818,7 +38429,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_54(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_54(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_54() { NextTest(); } @@ -37828,11 +38439,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_55, - OnFailureCallback_55); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_55, OnFailureCallback_55)); + return CHIP_NO_ERROR; } - void OnFailureResponse_55(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_55(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_55(int8_t int8s) { @@ -37855,7 +38467,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_56(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_56(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_56() { NextTest(); } @@ -37865,11 +38477,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_57, - OnFailureCallback_57); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_57, OnFailureCallback_57)); + return CHIP_NO_ERROR; } - void OnFailureResponse_57(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_57(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_57(int8_t int8s) { @@ -37884,11 +38497,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_58, - OnFailureCallback_58); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_58, OnFailureCallback_58)); + return CHIP_NO_ERROR; } - void OnFailureResponse_58(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_58(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_58(int16_t int16s) { @@ -37911,7 +38525,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_59(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_59(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_59() { NextTest(); } @@ -37921,11 +38535,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_60, - OnFailureCallback_60); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_60, OnFailureCallback_60)); + return CHIP_NO_ERROR; } - void OnFailureResponse_60(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_60(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_60(int16_t int16s) { @@ -37948,7 +38563,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_61(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_61(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_61() { NextTest(); } @@ -37958,11 +38573,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_62, - OnFailureCallback_62); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_62, OnFailureCallback_62)); + return CHIP_NO_ERROR; } - void OnFailureResponse_62(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_62(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_62(int16_t int16s) { @@ -37985,7 +38601,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_63(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_63(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_63() { NextTest(); } @@ -37995,11 +38611,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_64, - OnFailureCallback_64); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_64, OnFailureCallback_64)); + return CHIP_NO_ERROR; } - void OnFailureResponse_64(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_64(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_64(int16_t int16s) { @@ -38014,11 +38631,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_65, - OnFailureCallback_65); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_65, OnFailureCallback_65)); + return CHIP_NO_ERROR; } - void OnFailureResponse_65(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_65(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_65(int32_t int32s) { @@ -38041,7 +38659,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_66(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_66(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_66() { NextTest(); } @@ -38051,11 +38669,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_67, - OnFailureCallback_67); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_67, OnFailureCallback_67)); + return CHIP_NO_ERROR; } - void OnFailureResponse_67(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_67(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_67(int32_t int32s) { @@ -38078,7 +38697,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_68(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_68(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_68() { NextTest(); } @@ -38088,11 +38707,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_69, - OnFailureCallback_69); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_69, OnFailureCallback_69)); + return CHIP_NO_ERROR; } - void OnFailureResponse_69(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_69(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_69(int32_t int32s) { @@ -38115,7 +38735,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_70(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_70(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_70() { NextTest(); } @@ -38125,11 +38745,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_71, - OnFailureCallback_71); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_71, OnFailureCallback_71)); + return CHIP_NO_ERROR; } - void OnFailureResponse_71(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_71(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_71(int32_t int32s) { @@ -38144,11 +38765,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_72, - OnFailureCallback_72); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_72, OnFailureCallback_72)); + return CHIP_NO_ERROR; } - void OnFailureResponse_72(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_72(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_72(int64_t int64s) { @@ -38171,7 +38793,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_73(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_73(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_73() { NextTest(); } @@ -38181,11 +38803,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_74, - OnFailureCallback_74); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_74, OnFailureCallback_74)); + return CHIP_NO_ERROR; } - void OnFailureResponse_74(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_74(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_74(int64_t int64s) { @@ -38208,7 +38831,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_75(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_75(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_75() { NextTest(); } @@ -38218,11 +38841,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_76, - OnFailureCallback_76); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_76, OnFailureCallback_76)); + return CHIP_NO_ERROR; } - void OnFailureResponse_76(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_76(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_76(int64_t int64s) { @@ -38245,7 +38869,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_77(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_77(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_77() { NextTest(); } @@ -38255,11 +38879,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_78, - OnFailureCallback_78); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_78, OnFailureCallback_78)); + return CHIP_NO_ERROR; } - void OnFailureResponse_78(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_78(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_78(int64_t int64s) { @@ -38274,11 +38899,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_79, OnFailureCallback_79); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_79, OnFailureCallback_79)); + return CHIP_NO_ERROR; } - void OnFailureResponse_79(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_79(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_79(float floatSingle) { @@ -38301,7 +38927,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_80(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_80(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_80() { NextTest(); } @@ -38311,11 +38937,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_81, OnFailureCallback_81); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_81, OnFailureCallback_81)); + return CHIP_NO_ERROR; } - void OnFailureResponse_81(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_81(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_81(float floatSingle) { @@ -38338,7 +38965,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_82(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_82(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_82() { NextTest(); } @@ -38348,11 +38975,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_83, OnFailureCallback_83); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_83, OnFailureCallback_83)); + return CHIP_NO_ERROR; } - void OnFailureResponse_83(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_83(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_83(float floatSingle) { @@ -38375,7 +39003,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_84(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_84(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_84() { NextTest(); } @@ -38385,11 +39013,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_85, OnFailureCallback_85); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_85, OnFailureCallback_85)); + return CHIP_NO_ERROR; } - void OnFailureResponse_85(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_85(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_85(float floatSingle) { @@ -38412,7 +39041,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_86(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_86(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_86() { NextTest(); } @@ -38422,11 +39051,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_87, OnFailureCallback_87); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_87, OnFailureCallback_87)); + return CHIP_NO_ERROR; } - void OnFailureResponse_87(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_87(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_87(float floatSingle) { @@ -38441,11 +39071,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_88, OnFailureCallback_88); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_88, OnFailureCallback_88)); + return CHIP_NO_ERROR; } - void OnFailureResponse_88(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_88(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_88(double floatDouble) { @@ -38468,7 +39099,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_89(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_89(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_89() { NextTest(); } @@ -38478,11 +39109,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_90, OnFailureCallback_90); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_90, OnFailureCallback_90)); + return CHIP_NO_ERROR; } - void OnFailureResponse_90(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_90(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_90(double floatDouble) { @@ -38505,7 +39137,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_91(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_91(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_91() { NextTest(); } @@ -38515,11 +39147,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_92, OnFailureCallback_92); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_92, OnFailureCallback_92)); + return CHIP_NO_ERROR; } - void OnFailureResponse_92(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_92(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_92(double floatDouble) { @@ -38542,7 +39175,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_93(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_93(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_93() { NextTest(); } @@ -38552,11 +39185,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_94, OnFailureCallback_94); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_94, OnFailureCallback_94)); + return CHIP_NO_ERROR; } - void OnFailureResponse_94(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_94(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_94(double floatDouble) { @@ -38579,7 +39213,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_95(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_95(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_95() { NextTest(); } @@ -38589,11 +39223,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_96, OnFailureCallback_96); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_96, OnFailureCallback_96)); + return CHIP_NO_ERROR; } - void OnFailureResponse_96(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_96(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_96(double floatDouble) { @@ -38608,11 +39243,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_97, - OnFailureCallback_97); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_97, OnFailureCallback_97)); + return CHIP_NO_ERROR; } - void OnFailureResponse_97(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_97(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_97(uint8_t enum8) { @@ -38635,7 +39271,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_98(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_98(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_98() { NextTest(); } @@ -38645,11 +39281,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_99, - OnFailureCallback_99); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_99, OnFailureCallback_99)); + return CHIP_NO_ERROR; } - void OnFailureResponse_99(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_99(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_99(uint8_t enum8) { @@ -38672,7 +39309,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_100(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_100(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_100() { NextTest(); } @@ -38682,11 +39319,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_101, - OnFailureCallback_101); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_101, OnFailureCallback_101)); + return CHIP_NO_ERROR; } - void OnFailureResponse_101(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_101(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_101(uint8_t enum8) { @@ -38701,11 +39339,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_102, - OnFailureCallback_102); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_102, OnFailureCallback_102)); + return CHIP_NO_ERROR; } - void OnFailureResponse_102(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_102(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_102(uint16_t enum16) { @@ -38728,7 +39367,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_103(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_103(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_103() { NextTest(); } @@ -38738,11 +39377,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_104, - OnFailureCallback_104); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_104, OnFailureCallback_104)); + return CHIP_NO_ERROR; } - void OnFailureResponse_104(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_104(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_104(uint16_t enum16) { @@ -38765,7 +39405,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_105(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_105(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_105() { NextTest(); } @@ -38775,11 +39415,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_106, - OnFailureCallback_106); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_106, OnFailureCallback_106)); + return CHIP_NO_ERROR; } - void OnFailureResponse_106(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_106(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_106(uint16_t enum16) { @@ -38794,11 +39435,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_107, OnFailureCallback_107); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_107, OnFailureCallback_107)); + return CHIP_NO_ERROR; } - void OnFailureResponse_107(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_107(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_107(chip::ByteSpan octetString) { @@ -38821,7 +39463,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_108(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_108(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_108() { NextTest(); } @@ -38831,11 +39473,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_109, OnFailureCallback_109); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_109, OnFailureCallback_109)); + return CHIP_NO_ERROR; } - void OnFailureResponse_109(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_109(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_109(chip::ByteSpan octetString) { @@ -38859,7 +39502,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_110(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_110(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_110() { NextTest(); } @@ -38869,11 +39512,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_111, OnFailureCallback_111); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_111, OnFailureCallback_111)); + return CHIP_NO_ERROR; } - void OnFailureResponse_111(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_111(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_111(chip::ByteSpan octetString) { @@ -38898,7 +39542,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_112(uint8_t status) + void OnFailureResponse_112(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); NextTest(); @@ -38912,11 +39556,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_113, OnFailureCallback_113); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_113, OnFailureCallback_113)); + return CHIP_NO_ERROR; } - void OnFailureResponse_113(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_113(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_113(chip::ByteSpan octetString) { @@ -38940,7 +39585,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_114(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_114(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_114() { NextTest(); } @@ -38950,11 +39595,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_115, OnFailureCallback_115); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_115, OnFailureCallback_115)); + return CHIP_NO_ERROR; } - void OnFailureResponse_115(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_115(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_115(chip::ByteSpan longOctetString) { @@ -38982,7 +39628,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_116(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_116(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_116() { NextTest(); } @@ -38992,11 +39638,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_117, OnFailureCallback_117); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_117, OnFailureCallback_117)); + return CHIP_NO_ERROR; } - void OnFailureResponse_117(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_117(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_117(chip::ByteSpan longOctetString) { @@ -39026,7 +39673,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_118(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_118(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_118() { NextTest(); } @@ -39036,11 +39683,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_119, OnFailureCallback_119); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_119, OnFailureCallback_119)); + return CHIP_NO_ERROR; } - void OnFailureResponse_119(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_119(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_119(chip::CharSpan charString) { @@ -39063,7 +39711,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_120(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_120(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_120() { NextTest(); } @@ -39073,11 +39721,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_121, OnFailureCallback_121); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_121, OnFailureCallback_121)); + return CHIP_NO_ERROR; } - void OnFailureResponse_121(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_121(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_121(chip::CharSpan charString) { @@ -39100,7 +39749,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_122(uint8_t status) + void OnFailureResponse_122(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); NextTest(); @@ -39114,11 +39763,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_123, OnFailureCallback_123); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_123, OnFailureCallback_123)); + return CHIP_NO_ERROR; } - void OnFailureResponse_123(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_123(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_123(chip::CharSpan charString) { @@ -39141,7 +39791,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_124(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_124(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_124() { NextTest(); } @@ -39151,11 +39801,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_125, OnFailureCallback_125); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_125, OnFailureCallback_125)); + return CHIP_NO_ERROR; } - void OnFailureResponse_125(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_125(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_125(chip::CharSpan longCharString) { @@ -39182,7 +39833,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_126(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_126(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_126() { NextTest(); } @@ -39192,11 +39843,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_127, OnFailureCallback_127); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_127, OnFailureCallback_127)); + return CHIP_NO_ERROR; } - void OnFailureResponse_127(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_127(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_127(chip::CharSpan longCharString) { @@ -39224,7 +39876,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_128(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_128(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_128() { NextTest(); } @@ -39234,11 +39886,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_129, OnFailureCallback_129); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_129, OnFailureCallback_129)); + return CHIP_NO_ERROR; } - void OnFailureResponse_129(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_129(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_129(const chip::app::DataModel::DecodableList & listLongOctetString) { @@ -39298,11 +39951,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_130, - OnFailureCallback_130); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_130, OnFailureCallback_130)); + return CHIP_NO_ERROR; } - void OnFailureResponse_130(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_130(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_130(uint64_t epochUs) { @@ -39325,7 +39979,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_131(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_131(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_131() { NextTest(); } @@ -39335,11 +39989,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_132, - OnFailureCallback_132); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_132, OnFailureCallback_132)); + return CHIP_NO_ERROR; } - void OnFailureResponse_132(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_132(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_132(uint64_t epochUs) { @@ -39362,7 +40017,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_133(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_133(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_133() { NextTest(); } @@ -39372,11 +40027,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_134, - OnFailureCallback_134); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_134, OnFailureCallback_134)); + return CHIP_NO_ERROR; } - void OnFailureResponse_134(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_134(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_134(uint64_t epochUs) { @@ -39391,11 +40047,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_135, - OnFailureCallback_135); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_135, OnFailureCallback_135)); + return CHIP_NO_ERROR; } - void OnFailureResponse_135(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_135(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_135(uint32_t epochS) { @@ -39418,7 +40075,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_136(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_136(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_136() { NextTest(); } @@ -39428,11 +40085,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_137, - OnFailureCallback_137); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_137, OnFailureCallback_137)); + return CHIP_NO_ERROR; } - void OnFailureResponse_137(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_137(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_137(uint32_t epochS) { @@ -39455,7 +40113,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_138(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_138(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_138() { NextTest(); } @@ -39465,11 +40123,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_139, - OnFailureCallback_139); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_139, OnFailureCallback_139)); + return CHIP_NO_ERROR; } - void OnFailureResponse_139(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_139(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_139(uint32_t epochS) { @@ -39484,11 +40143,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_140, OnFailureCallback_140); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_140, OnFailureCallback_140)); + return CHIP_NO_ERROR; } - void OnFailureResponse_140(uint8_t status) + void OnFailureResponse_140(EmberAfStatus status) { (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) ? NextTest() : ThrowFailureResponse(); } @@ -39514,7 +40174,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_141(uint8_t status) + void OnFailureResponse_141(EmberAfStatus status) { (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) ? NextTest() : ThrowFailureResponse(); } @@ -39540,7 +40200,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_142(uint8_t status) + void OnFailureResponse_142(EmberAfStatus status) { VerifyOrReturn(CheckConstraintNotValue("status", status, 0)); NextTest(); @@ -39567,7 +40227,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_143(uint8_t status) + void OnFailureResponse_143(EmberAfStatus status) { VerifyOrReturn(CheckConstraintNotValue("status", status, 0)); NextTest(); @@ -39581,11 +40241,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_144, - OnFailureCallback_144); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_144, OnFailureCallback_144)); + return CHIP_NO_ERROR; } - void OnFailureResponse_144(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_144(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_144(chip::VendorId vendorId) { @@ -39608,7 +40269,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_145(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_145(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_145() { NextTest(); } @@ -39618,11 +40279,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_146, - OnFailureCallback_146); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_146, OnFailureCallback_146)); + return CHIP_NO_ERROR; } - void OnFailureResponse_146(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_146(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_146(chip::VendorId vendorId) { @@ -39645,7 +40307,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_147(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_147(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_147() { NextTest(); } @@ -39670,7 +40332,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_148(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_148(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_148(chip::VendorId arg1, chip::app::Clusters::TestCluster::SimpleEnum arg2) { @@ -39709,7 +40371,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_149(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_149(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_149(bool value) { @@ -39746,7 +40408,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_150(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_150(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_150(bool value) { @@ -39786,7 +40448,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_151(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_151(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_151(bool value) { @@ -39826,7 +40488,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_152(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_152(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_152(bool value) { @@ -39905,7 +40567,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_153(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_153(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_153(bool value) { @@ -39984,7 +40646,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_154(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_154(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_154(bool value) { @@ -40021,7 +40683,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_155(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_155(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_155(const chip::app::Clusters::TestCluster::Structs::SimpleStruct::DecodableType & arg1) { @@ -40068,7 +40730,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_156(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_156(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_156(bool value) { @@ -40109,7 +40771,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_157(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_157(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_157(bool value) { @@ -40149,7 +40811,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_158(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_158(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_158(const chip::app::DataModel::DecodableList & arg1) { @@ -40198,7 +40860,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_159(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_159(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_159(const chip::app::DataModel::DecodableList & arg1) { @@ -40249,7 +40911,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_160(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_160(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_160(bool value) { @@ -40299,7 +40961,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_161(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_161(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_161(bool value) { @@ -40382,7 +41044,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_162(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_162(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_162(bool value) { @@ -40465,7 +41127,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_163(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_163(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_163(bool value) { @@ -40494,7 +41156,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_164(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_164(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_164() { NextTest(); } @@ -40504,11 +41166,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_165, - OnFailureCallback_165); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_165, OnFailureCallback_165)); + return CHIP_NO_ERROR; } - void OnFailureResponse_165(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_165(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_165(const chip::app::DataModel::DecodableList & listInt8u) { @@ -40546,7 +41209,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_166(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_166(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_166() { NextTest(); } @@ -40556,11 +41219,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_167, OnFailureCallback_167); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_167, OnFailureCallback_167)); + return CHIP_NO_ERROR; } - void OnFailureResponse_167(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_167(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_167(const chip::app::DataModel::DecodableList & listOctetString) { @@ -40616,7 +41280,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_168(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_168(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_168() { NextTest(); } @@ -40626,11 +41290,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_169, OnFailureCallback_169); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_169, OnFailureCallback_169)); + return CHIP_NO_ERROR; } - void OnFailureResponse_169(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_169(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_169( const chip::app::DataModel::DecodableList & @@ -40679,7 +41344,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_170(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_170(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_170(bool wasPresent, const chip::Optional & wasNull, const chip::Optional & value, const chip::Optional> & originalValue) @@ -40719,7 +41384,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_171(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_171(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_171(bool wasPresent, const chip::Optional & wasNull, const chip::Optional & value, const chip::Optional> & originalValue) @@ -40743,7 +41408,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_172(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_172(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_172() { NextTest(); } @@ -40753,11 +41418,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_173, OnFailureCallback_173); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_173, OnFailureCallback_173)); + return CHIP_NO_ERROR; } - void OnFailureResponse_173(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_173(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_173(const chip::app::DataModel::Nullable & nullableBoolean) { @@ -40780,7 +41446,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_174(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_174(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_174() { NextTest(); } @@ -40790,11 +41456,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_175, OnFailureCallback_175); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_175, OnFailureCallback_175)); + return CHIP_NO_ERROR; } - void OnFailureResponse_175(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_175(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_175(const chip::app::DataModel::Nullable & nullableBoolean) { @@ -40818,7 +41485,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_176(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_176(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_176() { NextTest(); } @@ -40828,11 +41495,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_177, OnFailureCallback_177); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_177, OnFailureCallback_177)); + return CHIP_NO_ERROR; } - void OnFailureResponse_177(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_177(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_177(const chip::app::DataModel::Nullable & nullableBitmap8) { @@ -40856,7 +41524,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_178(uint8_t status) + void OnFailureResponse_178(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); NextTest(); @@ -40870,11 +41538,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_179, OnFailureCallback_179); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_179, OnFailureCallback_179)); + return CHIP_NO_ERROR; } - void OnFailureResponse_179(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_179(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_179(const chip::app::DataModel::Nullable & nullableBitmap8) { @@ -40898,7 +41567,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_180(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_180(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_180() { NextTest(); } @@ -40908,11 +41577,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_181, OnFailureCallback_181); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_181, OnFailureCallback_181)); + return CHIP_NO_ERROR; } - void OnFailureResponse_181(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_181(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_181(const chip::app::DataModel::Nullable & nullableBitmap8) { @@ -40935,7 +41605,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_182(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_182(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_182() { NextTest(); } @@ -40945,11 +41615,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_183, OnFailureCallback_183); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_183, OnFailureCallback_183)); + return CHIP_NO_ERROR; } - void OnFailureResponse_183(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_183(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_183(const chip::app::DataModel::Nullable & nullableBitmap16) { @@ -40973,7 +41644,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_184(uint8_t status) + void OnFailureResponse_184(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); NextTest(); @@ -40987,11 +41658,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_185, OnFailureCallback_185); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_185, OnFailureCallback_185)); + return CHIP_NO_ERROR; } - void OnFailureResponse_185(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_185(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_185(const chip::app::DataModel::Nullable & nullableBitmap16) { @@ -41015,7 +41687,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_186(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_186(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_186() { NextTest(); } @@ -41025,11 +41697,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_187, OnFailureCallback_187); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_187, OnFailureCallback_187)); + return CHIP_NO_ERROR; } - void OnFailureResponse_187(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_187(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_187(const chip::app::DataModel::Nullable & nullableBitmap16) { @@ -41052,7 +41725,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_188(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_188(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_188() { NextTest(); } @@ -41062,11 +41735,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_189, OnFailureCallback_189); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_189, OnFailureCallback_189)); + return CHIP_NO_ERROR; } - void OnFailureResponse_189(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_189(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_189(const chip::app::DataModel::Nullable & nullableBitmap32) { @@ -41090,7 +41764,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_190(uint8_t status) + void OnFailureResponse_190(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); NextTest(); @@ -41104,11 +41778,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_191, OnFailureCallback_191); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_191, OnFailureCallback_191)); + return CHIP_NO_ERROR; } - void OnFailureResponse_191(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_191(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_191(const chip::app::DataModel::Nullable & nullableBitmap32) { @@ -41132,7 +41807,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_192(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_192(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_192() { NextTest(); } @@ -41142,11 +41817,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_193, OnFailureCallback_193); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_193, OnFailureCallback_193)); + return CHIP_NO_ERROR; } - void OnFailureResponse_193(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_193(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_193(const chip::app::DataModel::Nullable & nullableBitmap32) { @@ -41169,7 +41845,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_194(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_194(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_194() { NextTest(); } @@ -41179,11 +41855,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_195, OnFailureCallback_195); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_195, OnFailureCallback_195)); + return CHIP_NO_ERROR; } - void OnFailureResponse_195(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_195(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_195(const chip::app::DataModel::Nullable & nullableBitmap64) { @@ -41207,7 +41884,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_196(uint8_t status) + void OnFailureResponse_196(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); NextTest(); @@ -41221,11 +41898,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_197, OnFailureCallback_197); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_197, OnFailureCallback_197)); + return CHIP_NO_ERROR; } - void OnFailureResponse_197(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_197(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_197(const chip::app::DataModel::Nullable & nullableBitmap64) { @@ -41249,7 +41927,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_198(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_198(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_198() { NextTest(); } @@ -41259,11 +41937,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_199, OnFailureCallback_199); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_199, OnFailureCallback_199)); + return CHIP_NO_ERROR; } - void OnFailureResponse_199(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_199(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_199(const chip::app::DataModel::Nullable & nullableBitmap64) { @@ -41286,7 +41965,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_200(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_200(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_200() { NextTest(); } @@ -41296,11 +41975,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_201, OnFailureCallback_201); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_201, OnFailureCallback_201)); + return CHIP_NO_ERROR; } - void OnFailureResponse_201(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_201(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_201(const chip::app::DataModel::Nullable & nullableInt8u) { @@ -41324,7 +42004,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_202(uint8_t status) + void OnFailureResponse_202(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); NextTest(); @@ -41338,11 +42018,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_203, OnFailureCallback_203); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_203, OnFailureCallback_203)); + return CHIP_NO_ERROR; } - void OnFailureResponse_203(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_203(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_203(const chip::app::DataModel::Nullable & nullableInt8u) { @@ -41366,7 +42047,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_204(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_204(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_204() { NextTest(); } @@ -41376,11 +42057,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_205, OnFailureCallback_205); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_205, OnFailureCallback_205)); + return CHIP_NO_ERROR; } - void OnFailureResponse_205(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_205(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_205(const chip::app::DataModel::Nullable & nullableInt8u) { @@ -41403,7 +42085,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_206(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_206(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_206() { NextTest(); } @@ -41413,11 +42095,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_207, OnFailureCallback_207); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_207, OnFailureCallback_207)); + return CHIP_NO_ERROR; } - void OnFailureResponse_207(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_207(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_207(const chip::app::DataModel::Nullable & nullableInt16u) { @@ -41441,7 +42124,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_208(uint8_t status) + void OnFailureResponse_208(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); NextTest(); @@ -41455,11 +42138,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_209, OnFailureCallback_209); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_209, OnFailureCallback_209)); + return CHIP_NO_ERROR; } - void OnFailureResponse_209(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_209(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_209(const chip::app::DataModel::Nullable & nullableInt16u) { @@ -41483,7 +42167,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_210(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_210(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_210() { NextTest(); } @@ -41493,11 +42177,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_211, OnFailureCallback_211); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_211, OnFailureCallback_211)); + return CHIP_NO_ERROR; } - void OnFailureResponse_211(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_211(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_211(const chip::app::DataModel::Nullable & nullableInt16u) { @@ -41520,7 +42205,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_212(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_212(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_212() { NextTest(); } @@ -41530,11 +42215,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_213, OnFailureCallback_213); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_213, OnFailureCallback_213)); + return CHIP_NO_ERROR; } - void OnFailureResponse_213(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_213(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_213(const chip::app::DataModel::Nullable & nullableInt32u) { @@ -41558,7 +42244,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_214(uint8_t status) + void OnFailureResponse_214(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); NextTest(); @@ -41572,11 +42258,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_215, OnFailureCallback_215); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_215, OnFailureCallback_215)); + return CHIP_NO_ERROR; } - void OnFailureResponse_215(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_215(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_215(const chip::app::DataModel::Nullable & nullableInt32u) { @@ -41600,7 +42287,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_216(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_216(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_216() { NextTest(); } @@ -41610,11 +42297,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_217, OnFailureCallback_217); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_217, OnFailureCallback_217)); + return CHIP_NO_ERROR; } - void OnFailureResponse_217(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_217(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_217(const chip::app::DataModel::Nullable & nullableInt32u) { @@ -41637,7 +42325,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_218(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_218(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_218() { NextTest(); } @@ -41647,11 +42335,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_219, OnFailureCallback_219); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_219, OnFailureCallback_219)); + return CHIP_NO_ERROR; } - void OnFailureResponse_219(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_219(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_219(const chip::app::DataModel::Nullable & nullableInt64u) { @@ -41675,7 +42364,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_220(uint8_t status) + void OnFailureResponse_220(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); NextTest(); @@ -41689,11 +42378,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_221, OnFailureCallback_221); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_221, OnFailureCallback_221)); + return CHIP_NO_ERROR; } - void OnFailureResponse_221(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_221(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_221(const chip::app::DataModel::Nullable & nullableInt64u) { @@ -41717,7 +42407,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_222(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_222(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_222() { NextTest(); } @@ -41727,11 +42417,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_223, OnFailureCallback_223); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_223, OnFailureCallback_223)); + return CHIP_NO_ERROR; } - void OnFailureResponse_223(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_223(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_223(const chip::app::DataModel::Nullable & nullableInt64u) { @@ -41754,7 +42445,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_224(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_224(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_224() { NextTest(); } @@ -41764,11 +42455,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_225, OnFailureCallback_225); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_225, OnFailureCallback_225)); + return CHIP_NO_ERROR; } - void OnFailureResponse_225(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_225(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_225(const chip::app::DataModel::Nullable & nullableInt8s) { @@ -41792,7 +42484,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_226(uint8_t status) + void OnFailureResponse_226(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); NextTest(); @@ -41806,11 +42498,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_227, OnFailureCallback_227); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_227, OnFailureCallback_227)); + return CHIP_NO_ERROR; } - void OnFailureResponse_227(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_227(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_227(const chip::app::DataModel::Nullable & nullableInt8s) { @@ -41834,7 +42527,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_228(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_228(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_228() { NextTest(); } @@ -41844,11 +42537,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_229, OnFailureCallback_229); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_229, OnFailureCallback_229)); + return CHIP_NO_ERROR; } - void OnFailureResponse_229(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_229(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_229(const chip::app::DataModel::Nullable & nullableInt8s) { @@ -41871,7 +42565,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_230(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_230(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_230() { NextTest(); } @@ -41881,11 +42575,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_231, OnFailureCallback_231); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_231, OnFailureCallback_231)); + return CHIP_NO_ERROR; } - void OnFailureResponse_231(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_231(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_231(const chip::app::DataModel::Nullable & nullableInt16s) { @@ -41909,7 +42604,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_232(uint8_t status) + void OnFailureResponse_232(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); NextTest(); @@ -41923,11 +42618,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_233, OnFailureCallback_233); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_233, OnFailureCallback_233)); + return CHIP_NO_ERROR; } - void OnFailureResponse_233(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_233(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_233(const chip::app::DataModel::Nullable & nullableInt16s) { @@ -41951,7 +42647,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_234(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_234(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_234() { NextTest(); } @@ -41961,11 +42657,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_235, OnFailureCallback_235); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_235, OnFailureCallback_235)); + return CHIP_NO_ERROR; } - void OnFailureResponse_235(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_235(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_235(const chip::app::DataModel::Nullable & nullableInt16s) { @@ -41988,7 +42685,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_236(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_236(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_236() { NextTest(); } @@ -41998,11 +42695,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_237, OnFailureCallback_237); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_237, OnFailureCallback_237)); + return CHIP_NO_ERROR; } - void OnFailureResponse_237(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_237(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_237(const chip::app::DataModel::Nullable & nullableInt32s) { @@ -42026,7 +42724,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_238(uint8_t status) + void OnFailureResponse_238(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); NextTest(); @@ -42040,11 +42738,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_239, OnFailureCallback_239); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_239, OnFailureCallback_239)); + return CHIP_NO_ERROR; } - void OnFailureResponse_239(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_239(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_239(const chip::app::DataModel::Nullable & nullableInt32s) { @@ -42068,7 +42767,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_240(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_240(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_240() { NextTest(); } @@ -42078,11 +42777,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_241, OnFailureCallback_241); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_241, OnFailureCallback_241)); + return CHIP_NO_ERROR; } - void OnFailureResponse_241(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_241(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_241(const chip::app::DataModel::Nullable & nullableInt32s) { @@ -42105,7 +42805,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_242(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_242(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_242() { NextTest(); } @@ -42115,11 +42815,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_243, OnFailureCallback_243); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_243, OnFailureCallback_243)); + return CHIP_NO_ERROR; } - void OnFailureResponse_243(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_243(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_243(const chip::app::DataModel::Nullable & nullableInt64s) { @@ -42143,7 +42844,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_244(uint8_t status) + void OnFailureResponse_244(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); NextTest(); @@ -42157,11 +42858,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_245, OnFailureCallback_245); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_245, OnFailureCallback_245)); + return CHIP_NO_ERROR; } - void OnFailureResponse_245(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_245(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_245(const chip::app::DataModel::Nullable & nullableInt64s) { @@ -42185,7 +42887,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_246(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_246(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_246() { NextTest(); } @@ -42195,11 +42897,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_247, OnFailureCallback_247); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_247, OnFailureCallback_247)); + return CHIP_NO_ERROR; } - void OnFailureResponse_247(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_247(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_247(const chip::app::DataModel::Nullable & nullableInt64s) { @@ -42222,7 +42925,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_248(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_248(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_248() { NextTest(); } @@ -42232,11 +42935,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_249, OnFailureCallback_249); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_249, OnFailureCallback_249)); + return CHIP_NO_ERROR; } - void OnFailureResponse_249(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_249(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_249(const chip::app::DataModel::Nullable & nullableFloatSingle) { @@ -42260,7 +42964,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_250(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_250(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_250() { NextTest(); } @@ -42270,11 +42974,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_251, OnFailureCallback_251); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_251, OnFailureCallback_251)); + return CHIP_NO_ERROR; } - void OnFailureResponse_251(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_251(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_251(const chip::app::DataModel::Nullable & nullableFloatSingle) { @@ -42298,7 +43003,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_252(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_252(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_252() { NextTest(); } @@ -42308,11 +43013,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_253, OnFailureCallback_253); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_253, OnFailureCallback_253)); + return CHIP_NO_ERROR; } - void OnFailureResponse_253(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_253(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_253(const chip::app::DataModel::Nullable & nullableFloatSingle) { @@ -42336,7 +43042,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_254(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_254(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_254() { NextTest(); } @@ -42346,11 +43052,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_255, OnFailureCallback_255); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_255, OnFailureCallback_255)); + return CHIP_NO_ERROR; } - void OnFailureResponse_255(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_255(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_255(const chip::app::DataModel::Nullable & nullableFloatSingle) { @@ -42373,7 +43080,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_256(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_256(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_256() { NextTest(); } @@ -42383,11 +43090,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_257, OnFailureCallback_257); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_257, OnFailureCallback_257)); + return CHIP_NO_ERROR; } - void OnFailureResponse_257(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_257(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_257(const chip::app::DataModel::Nullable & nullableFloatSingle) { @@ -42411,7 +43119,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_258(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_258(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_258() { NextTest(); } @@ -42421,11 +43129,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_259, OnFailureCallback_259); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_259, OnFailureCallback_259)); + return CHIP_NO_ERROR; } - void OnFailureResponse_259(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_259(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_259(const chip::app::DataModel::Nullable & nullableFloatDouble) { @@ -42449,7 +43158,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_260(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_260(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_260() { NextTest(); } @@ -42459,11 +43168,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_261, OnFailureCallback_261); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_261, OnFailureCallback_261)); + return CHIP_NO_ERROR; } - void OnFailureResponse_261(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_261(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_261(const chip::app::DataModel::Nullable & nullableFloatDouble) { @@ -42487,7 +43197,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_262(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_262(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_262() { NextTest(); } @@ -42497,11 +43207,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_263, OnFailureCallback_263); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_263, OnFailureCallback_263)); + return CHIP_NO_ERROR; } - void OnFailureResponse_263(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_263(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_263(const chip::app::DataModel::Nullable & nullableFloatDouble) { @@ -42525,7 +43236,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_264(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_264(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_264() { NextTest(); } @@ -42535,11 +43246,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_265, OnFailureCallback_265); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_265, OnFailureCallback_265)); + return CHIP_NO_ERROR; } - void OnFailureResponse_265(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_265(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_265(const chip::app::DataModel::Nullable & nullableFloatDouble) { @@ -42562,7 +43274,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_266(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_266(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_266() { NextTest(); } @@ -42572,11 +43284,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_267, OnFailureCallback_267); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_267, OnFailureCallback_267)); + return CHIP_NO_ERROR; } - void OnFailureResponse_267(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_267(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_267(const chip::app::DataModel::Nullable & nullableFloatDouble) { @@ -42600,7 +43313,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_268(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_268(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_268() { NextTest(); } @@ -42610,11 +43323,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_269, OnFailureCallback_269); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_269, OnFailureCallback_269)); + return CHIP_NO_ERROR; } - void OnFailureResponse_269(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_269(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_269(const chip::app::DataModel::Nullable & nullableEnum8) { @@ -42638,7 +43352,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_270(uint8_t status) + void OnFailureResponse_270(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); NextTest(); @@ -42652,11 +43366,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_271, OnFailureCallback_271); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_271, OnFailureCallback_271)); + return CHIP_NO_ERROR; } - void OnFailureResponse_271(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_271(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_271(const chip::app::DataModel::Nullable & nullableEnum8) { @@ -42680,7 +43395,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_272(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_272(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_272() { NextTest(); } @@ -42690,11 +43405,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_273, OnFailureCallback_273); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_273, OnFailureCallback_273)); + return CHIP_NO_ERROR; } - void OnFailureResponse_273(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_273(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_273(const chip::app::DataModel::Nullable & nullableEnum8) { @@ -42717,7 +43433,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_274(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_274(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_274() { NextTest(); } @@ -42727,11 +43443,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_275, OnFailureCallback_275); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_275, OnFailureCallback_275)); + return CHIP_NO_ERROR; } - void OnFailureResponse_275(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_275(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_275(const chip::app::DataModel::Nullable & nullableEnum16) { @@ -42755,7 +43472,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_276(uint8_t status) + void OnFailureResponse_276(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); NextTest(); @@ -42769,11 +43486,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_277, OnFailureCallback_277); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_277, OnFailureCallback_277)); + return CHIP_NO_ERROR; } - void OnFailureResponse_277(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_277(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_277(const chip::app::DataModel::Nullable & nullableEnum16) { @@ -42797,7 +43515,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_278(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_278(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_278() { NextTest(); } @@ -42807,11 +43525,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_279, OnFailureCallback_279); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_279, OnFailureCallback_279)); + return CHIP_NO_ERROR; } - void OnFailureResponse_279(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_279(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_279(const chip::app::DataModel::Nullable & nullableEnum16) { @@ -42826,11 +43545,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_280, OnFailureCallback_280); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_280, OnFailureCallback_280)); + return CHIP_NO_ERROR; } - void OnFailureResponse_280(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_280(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_280(const chip::app::DataModel::Nullable & nullableOctetString) { @@ -42856,7 +43576,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_281(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_281(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_281() { NextTest(); } @@ -42866,11 +43586,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_282, OnFailureCallback_282); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_282, OnFailureCallback_282)); + return CHIP_NO_ERROR; } - void OnFailureResponse_282(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_282(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_282(const chip::app::DataModel::Nullable & nullableOctetString) { @@ -42895,7 +43616,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_283(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_283(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_283() { NextTest(); } @@ -42905,11 +43626,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_284, OnFailureCallback_284); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_284, OnFailureCallback_284)); + return CHIP_NO_ERROR; } - void OnFailureResponse_284(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_284(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_284(const chip::app::DataModel::Nullable & nullableOctetString) { @@ -42933,7 +43655,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_285(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_285(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_285() { NextTest(); } @@ -42943,11 +43665,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_286, OnFailureCallback_286); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_286, OnFailureCallback_286)); + return CHIP_NO_ERROR; } - void OnFailureResponse_286(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_286(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_286(const chip::app::DataModel::Nullable & nullableOctetString) { @@ -42964,11 +43687,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_287, OnFailureCallback_287); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_287, OnFailureCallback_287)); + return CHIP_NO_ERROR; } - void OnFailureResponse_287(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_287(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_287(const chip::app::DataModel::Nullable & nullableCharString) { @@ -42992,7 +43716,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_288(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_288(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_288() { NextTest(); } @@ -43002,11 +43726,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_289, OnFailureCallback_289); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_289, OnFailureCallback_289)); + return CHIP_NO_ERROR; } - void OnFailureResponse_289(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_289(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_289(const chip::app::DataModel::Nullable & nullableCharString) { @@ -43030,7 +43755,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_290(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_290(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_290() { NextTest(); } @@ -43040,11 +43765,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_291, OnFailureCallback_291); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_291, OnFailureCallback_291)); + return CHIP_NO_ERROR; } - void OnFailureResponse_291(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_291(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_291(const chip::app::DataModel::Nullable & nullableCharString) { @@ -43067,7 +43793,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_292(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_292(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_292() { NextTest(); } @@ -43077,11 +43803,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_293, OnFailureCallback_293); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_293, OnFailureCallback_293)); + return CHIP_NO_ERROR; } - void OnFailureResponse_293(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_293(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_293(const chip::app::DataModel::Nullable & nullableCharString) { @@ -43097,11 +43824,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_294, - OnFailureCallback_294); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_294, OnFailureCallback_294)); + return CHIP_NO_ERROR; } - void OnFailureResponse_294(uint8_t status) + void OnFailureResponse_294(EmberAfStatus status) { VerifyOrReturn(CheckConstraintNotValue("status", status, 0)); NextTest(); @@ -43115,11 +43843,12 @@ class TestCluster : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_295, - OnFailureCallback_295); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_295, OnFailureCallback_295)); + return CHIP_NO_ERROR; } - void OnFailureResponse_295(uint8_t status) + void OnFailureResponse_295(EmberAfStatus status) { VerifyOrReturn(CheckConstraintNotValue("status", status, 0)); NextTest(); @@ -43146,7 +43875,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_296(uint8_t status) + void OnFailureResponse_296(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_INVALID_VALUE)); NextTest(); @@ -43174,7 +43903,7 @@ class TestCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_297(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_297(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_297() { NextTest(); } }; @@ -43313,7 +44042,7 @@ class TestClusterComplexTypes : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, bool timedWriteBoolean) @@ -43323,14 +44052,14 @@ class TestClusterComplexTypes : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context) { (static_cast(context))->OnSuccessResponse_8(); } static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context, bool timedWriteBoolean) @@ -43340,14 +44069,14 @@ class TestClusterComplexTypes : public TestCommand static void OnFailureCallback_10(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_10(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_10(status); } static void OnSuccessCallback_10(void * context) { (static_cast(context))->OnSuccessResponse_10(); } static void OnFailureCallback_11(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_11(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_11(status); } static void OnSuccessCallback_11(void * context, bool timedWriteBoolean) @@ -43357,14 +44086,14 @@ class TestClusterComplexTypes : public TestCommand static void OnFailureCallback_12(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_12(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_12(status); } static void OnSuccessCallback_12(void * context) { (static_cast(context))->OnSuccessResponse_12(); } static void OnFailureCallback_13(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_13(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_13(status); } static void OnSuccessCallback_13(void * context, bool timedWriteBoolean) @@ -43374,14 +44103,14 @@ class TestClusterComplexTypes : public TestCommand static void OnFailureCallback_14(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_14(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_14(status); } static void OnSuccessCallback_14(void * context) { (static_cast(context))->OnSuccessResponse_14(); } static void OnFailureCallback_15(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_15(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_15(status); } static void OnSuccessCallback_15(void * context, bool boolean) @@ -43391,14 +44120,14 @@ class TestClusterComplexTypes : public TestCommand static void OnFailureCallback_16(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_16(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_16(status); } static void OnSuccessCallback_16(void * context) { (static_cast(context))->OnSuccessResponse_16(); } static void OnFailureCallback_17(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_17(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_17(status); } static void OnSuccessCallback_17(void * context, bool boolean) @@ -43408,14 +44137,14 @@ class TestClusterComplexTypes : public TestCommand static void OnFailureCallback_18(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_18(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_18(status); } static void OnSuccessCallback_18(void * context) { (static_cast(context))->OnSuccessResponse_18(); } static void OnFailureCallback_19(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_19(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_19(status); } static void OnSuccessCallback_19(void * context, bool boolean) @@ -43425,7 +44154,7 @@ class TestClusterComplexTypes : public TestCommand static void OnFailureCallback_20(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_20(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_20(status); } static void OnSuccessCallback_20(void * context) { (static_cast(context))->OnSuccessResponse_20(); } @@ -43461,7 +44190,7 @@ class TestClusterComplexTypes : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(bool wasPresent, const chip::Optional & wasNull, const chip::Optional & value, const chip::Optional> & originalValue) @@ -43497,7 +44226,7 @@ class TestClusterComplexTypes : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) + void OnFailureResponse_2(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_NEEDS_TIMED_INTERACTION)); NextTest(); @@ -43525,7 +44254,7 @@ class TestClusterComplexTypes : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -43557,7 +44286,7 @@ class TestClusterComplexTypes : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) + void OnFailureResponse_4(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); NextTest(); @@ -43585,7 +44314,7 @@ class TestClusterComplexTypes : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -43617,7 +44346,7 @@ class TestClusterComplexTypes : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) + void OnFailureResponse_6(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); NextTest(); @@ -43631,11 +44360,12 @@ class TestClusterComplexTypes : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_7, OnFailureCallback_7); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(bool timedWriteBoolean) { @@ -43658,7 +44388,7 @@ class TestClusterComplexTypes : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) + void OnFailureResponse_8(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_NEEDS_TIMED_INTERACTION)); NextTest(); @@ -43672,11 +44402,12 @@ class TestClusterComplexTypes : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_9, OnFailureCallback_9); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_9, OnFailureCallback_9)); + return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9(bool timedWriteBoolean) { @@ -43707,7 +44438,7 @@ class TestClusterComplexTypes : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) + void OnFailureResponse_10(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); NextTest(); @@ -43721,11 +44452,12 @@ class TestClusterComplexTypes : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_11, OnFailureCallback_11); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_11, OnFailureCallback_11)); + return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11(bool timedWriteBoolean) { @@ -43748,7 +44480,7 @@ class TestClusterComplexTypes : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_12(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_12() { NextTest(); } @@ -43758,11 +44490,12 @@ class TestClusterComplexTypes : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_13, OnFailureCallback_13); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_13, OnFailureCallback_13)); + return CHIP_NO_ERROR; } - void OnFailureResponse_13(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_13(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_13(bool timedWriteBoolean) { @@ -43785,7 +44518,7 @@ class TestClusterComplexTypes : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_14(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_14(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_14() { NextTest(); } @@ -43795,11 +44528,12 @@ class TestClusterComplexTypes : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_15, - OnFailureCallback_15); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_15, OnFailureCallback_15)); + return CHIP_NO_ERROR; } - void OnFailureResponse_15(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_15(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_15(bool boolean) { @@ -43830,7 +44564,7 @@ class TestClusterComplexTypes : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_16(uint8_t status) + void OnFailureResponse_16(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_UNSUPPORTED_ACCESS)); NextTest(); @@ -43844,11 +44578,12 @@ class TestClusterComplexTypes : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_17, - OnFailureCallback_17); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_17, OnFailureCallback_17)); + return CHIP_NO_ERROR; } - void OnFailureResponse_17(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_17(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_17(bool boolean) { @@ -43871,7 +44606,7 @@ class TestClusterComplexTypes : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_18(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_18(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_18() { NextTest(); } @@ -43881,11 +44616,12 @@ class TestClusterComplexTypes : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_19, - OnFailureCallback_19); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_19, OnFailureCallback_19)); + return CHIP_NO_ERROR; } - void OnFailureResponse_19(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_19(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_19(bool boolean) { @@ -43908,7 +44644,7 @@ class TestClusterComplexTypes : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_20(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_20(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_20() { NextTest(); } }; @@ -44006,14 +44742,14 @@ class TestConstraints : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context) { (static_cast(context))->OnSuccessResponse_1(); } static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint32_t int32u) @@ -44023,7 +44759,7 @@ class TestConstraints : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint32_t int32u) @@ -44033,7 +44769,7 @@ class TestConstraints : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, uint32_t int32u) @@ -44043,21 +44779,21 @@ class TestConstraints : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context) { (static_cast(context))->OnSuccessResponse_5(); } static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context) { (static_cast(context))->OnSuccessResponse_6(); } static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, chip::CharSpan charString) @@ -44067,7 +44803,7 @@ class TestConstraints : public TestCommand static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context, chip::CharSpan charString) @@ -44077,7 +44813,7 @@ class TestConstraints : public TestCommand static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context, chip::CharSpan charString) @@ -44087,7 +44823,7 @@ class TestConstraints : public TestCommand static void OnFailureCallback_10(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_10(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_10(status); } static void OnSuccessCallback_10(void * context, chip::CharSpan charString) @@ -44097,7 +44833,7 @@ class TestConstraints : public TestCommand static void OnFailureCallback_11(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_11(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_11(status); } static void OnSuccessCallback_11(void * context) { (static_cast(context))->OnSuccessResponse_11(); } @@ -44126,7 +44862,7 @@ class TestConstraints : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -44136,11 +44872,12 @@ class TestConstraints : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint32_t int32u) { @@ -44155,11 +44892,12 @@ class TestConstraints : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_3, - OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint32_t int32u) { @@ -44174,11 +44912,12 @@ class TestConstraints : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_4, - OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint32_t int32u) { @@ -44201,7 +44940,7 @@ class TestConstraints : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -44219,7 +44958,7 @@ class TestConstraints : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6() { NextTest(); } @@ -44229,11 +44968,12 @@ class TestConstraints : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_7, - OnFailureCallback_7); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(chip::CharSpan charString) { @@ -44248,11 +44988,12 @@ class TestConstraints : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_8, - OnFailureCallback_8); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_8, OnFailureCallback_8)); + return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(chip::CharSpan charString) { @@ -44267,11 +45008,12 @@ class TestConstraints : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_9, - OnFailureCallback_9); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_9, OnFailureCallback_9)); + return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9(chip::CharSpan charString) { @@ -44286,11 +45028,12 @@ class TestConstraints : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_10, - OnFailureCallback_10); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_10, OnFailureCallback_10)); + return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10(chip::CharSpan charString) { @@ -44313,7 +45056,7 @@ class TestConstraints : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11() { NextTest(); } }; @@ -44905,7 +45648,7 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, bool boolean) @@ -44915,14 +45658,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context) { (static_cast(context))->OnSuccessResponse_5(); } static void OnFailureCallback_6(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_6(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_6(status); } static void OnSuccessCallback_6(void * context, bool boolean) @@ -44932,14 +45675,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context) { (static_cast(context))->OnSuccessResponse_7(); } static void OnFailureCallback_8(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_8(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_8(status); } static void OnSuccessCallback_8(void * context, bool boolean) @@ -44949,7 +45692,7 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_9(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_9(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_9(status); } static void OnSuccessCallback_9(void * context, uint8_t bitmap8) @@ -44959,14 +45702,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_10(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_10(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_10(status); } static void OnSuccessCallback_10(void * context) { (static_cast(context))->OnSuccessResponse_10(); } static void OnFailureCallback_11(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_11(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_11(status); } static void OnSuccessCallback_11(void * context, uint8_t bitmap8) @@ -44976,14 +45719,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_12(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_12(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_12(status); } static void OnSuccessCallback_12(void * context) { (static_cast(context))->OnSuccessResponse_12(); } static void OnFailureCallback_13(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_13(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_13(status); } static void OnSuccessCallback_13(void * context, uint8_t bitmap8) @@ -44993,7 +45736,7 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_14(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_14(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_14(status); } static void OnSuccessCallback_14(void * context, uint16_t bitmap16) @@ -45003,14 +45746,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_15(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_15(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_15(status); } static void OnSuccessCallback_15(void * context) { (static_cast(context))->OnSuccessResponse_15(); } static void OnFailureCallback_16(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_16(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_16(status); } static void OnSuccessCallback_16(void * context, uint16_t bitmap16) @@ -45020,14 +45763,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_17(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_17(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_17(status); } static void OnSuccessCallback_17(void * context) { (static_cast(context))->OnSuccessResponse_17(); } static void OnFailureCallback_18(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_18(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_18(status); } static void OnSuccessCallback_18(void * context, uint16_t bitmap16) @@ -45037,7 +45780,7 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_19(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_19(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_19(status); } static void OnSuccessCallback_19(void * context, uint32_t bitmap32) @@ -45047,14 +45790,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_20(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_20(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_20(status); } static void OnSuccessCallback_20(void * context) { (static_cast(context))->OnSuccessResponse_20(); } static void OnFailureCallback_21(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_21(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_21(status); } static void OnSuccessCallback_21(void * context, uint32_t bitmap32) @@ -45064,14 +45807,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_22(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_22(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_22(status); } static void OnSuccessCallback_22(void * context) { (static_cast(context))->OnSuccessResponse_22(); } static void OnFailureCallback_23(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_23(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_23(status); } static void OnSuccessCallback_23(void * context, uint32_t bitmap32) @@ -45081,7 +45824,7 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_24(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_24(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_24(status); } static void OnSuccessCallback_24(void * context, uint64_t bitmap64) @@ -45091,14 +45834,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_25(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_25(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_25(status); } static void OnSuccessCallback_25(void * context) { (static_cast(context))->OnSuccessResponse_25(); } static void OnFailureCallback_26(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_26(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_26(status); } static void OnSuccessCallback_26(void * context, uint64_t bitmap64) @@ -45108,14 +45851,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_27(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_27(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_27(status); } static void OnSuccessCallback_27(void * context) { (static_cast(context))->OnSuccessResponse_27(); } static void OnFailureCallback_28(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_28(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_28(status); } static void OnSuccessCallback_28(void * context, uint64_t bitmap64) @@ -45125,7 +45868,7 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_29(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_29(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_29(status); } static void OnSuccessCallback_29(void * context, uint8_t int8u) @@ -45135,14 +45878,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_30(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_30(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_30(status); } static void OnSuccessCallback_30(void * context) { (static_cast(context))->OnSuccessResponse_30(); } static void OnFailureCallback_31(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_31(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_31(status); } static void OnSuccessCallback_31(void * context, uint8_t int8u) @@ -45152,14 +45895,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_32(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_32(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_32(status); } static void OnSuccessCallback_32(void * context) { (static_cast(context))->OnSuccessResponse_32(); } static void OnFailureCallback_33(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_33(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_33(status); } static void OnSuccessCallback_33(void * context, uint8_t int8u) @@ -45169,7 +45912,7 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_34(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_34(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_34(status); } static void OnSuccessCallback_34(void * context, uint16_t int16u) @@ -45179,14 +45922,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_35(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_35(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_35(status); } static void OnSuccessCallback_35(void * context) { (static_cast(context))->OnSuccessResponse_35(); } static void OnFailureCallback_36(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_36(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_36(status); } static void OnSuccessCallback_36(void * context, uint16_t int16u) @@ -45196,14 +45939,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_37(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_37(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_37(status); } static void OnSuccessCallback_37(void * context) { (static_cast(context))->OnSuccessResponse_37(); } static void OnFailureCallback_38(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_38(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_38(status); } static void OnSuccessCallback_38(void * context, uint16_t int16u) @@ -45213,7 +45956,7 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_39(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_39(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_39(status); } static void OnSuccessCallback_39(void * context, uint32_t int32u) @@ -45223,14 +45966,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_40(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_40(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_40(status); } static void OnSuccessCallback_40(void * context) { (static_cast(context))->OnSuccessResponse_40(); } static void OnFailureCallback_41(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_41(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_41(status); } static void OnSuccessCallback_41(void * context, uint32_t int32u) @@ -45240,14 +45983,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_42(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_42(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_42(status); } static void OnSuccessCallback_42(void * context) { (static_cast(context))->OnSuccessResponse_42(); } static void OnFailureCallback_43(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_43(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_43(status); } static void OnSuccessCallback_43(void * context, uint32_t int32u) @@ -45257,7 +46000,7 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_44(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_44(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_44(status); } static void OnSuccessCallback_44(void * context, uint64_t int64u) @@ -45267,14 +46010,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_45(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_45(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_45(status); } static void OnSuccessCallback_45(void * context) { (static_cast(context))->OnSuccessResponse_45(); } static void OnFailureCallback_46(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_46(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_46(status); } static void OnSuccessCallback_46(void * context, uint64_t int64u) @@ -45284,14 +46027,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_47(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_47(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_47(status); } static void OnSuccessCallback_47(void * context) { (static_cast(context))->OnSuccessResponse_47(); } static void OnFailureCallback_48(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_48(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_48(status); } static void OnSuccessCallback_48(void * context, uint64_t int64u) @@ -45301,7 +46044,7 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_49(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_49(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_49(status); } static void OnSuccessCallback_49(void * context, int8_t int8s) @@ -45311,14 +46054,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_50(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_50(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_50(status); } static void OnSuccessCallback_50(void * context) { (static_cast(context))->OnSuccessResponse_50(); } static void OnFailureCallback_51(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_51(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_51(status); } static void OnSuccessCallback_51(void * context, int8_t int8s) @@ -45328,14 +46071,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_52(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_52(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_52(status); } static void OnSuccessCallback_52(void * context) { (static_cast(context))->OnSuccessResponse_52(); } static void OnFailureCallback_53(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_53(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_53(status); } static void OnSuccessCallback_53(void * context, int8_t int8s) @@ -45345,7 +46088,7 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_54(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_54(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_54(status); } static void OnSuccessCallback_54(void * context, int16_t int16s) @@ -45355,14 +46098,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_55(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_55(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_55(status); } static void OnSuccessCallback_55(void * context) { (static_cast(context))->OnSuccessResponse_55(); } static void OnFailureCallback_56(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_56(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_56(status); } static void OnSuccessCallback_56(void * context, int16_t int16s) @@ -45372,14 +46115,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_57(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_57(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_57(status); } static void OnSuccessCallback_57(void * context) { (static_cast(context))->OnSuccessResponse_57(); } static void OnFailureCallback_58(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_58(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_58(status); } static void OnSuccessCallback_58(void * context, int16_t int16s) @@ -45389,7 +46132,7 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_59(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_59(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_59(status); } static void OnSuccessCallback_59(void * context, int32_t int32s) @@ -45399,14 +46142,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_60(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_60(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_60(status); } static void OnSuccessCallback_60(void * context) { (static_cast(context))->OnSuccessResponse_60(); } static void OnFailureCallback_61(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_61(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_61(status); } static void OnSuccessCallback_61(void * context, int32_t int32s) @@ -45416,14 +46159,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_62(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_62(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_62(status); } static void OnSuccessCallback_62(void * context) { (static_cast(context))->OnSuccessResponse_62(); } static void OnFailureCallback_63(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_63(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_63(status); } static void OnSuccessCallback_63(void * context, int32_t int32s) @@ -45433,7 +46176,7 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_64(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_64(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_64(status); } static void OnSuccessCallback_64(void * context, int64_t int64s) @@ -45443,14 +46186,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_65(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_65(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_65(status); } static void OnSuccessCallback_65(void * context) { (static_cast(context))->OnSuccessResponse_65(); } static void OnFailureCallback_66(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_66(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_66(status); } static void OnSuccessCallback_66(void * context, int64_t int64s) @@ -45460,14 +46203,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_67(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_67(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_67(status); } static void OnSuccessCallback_67(void * context) { (static_cast(context))->OnSuccessResponse_67(); } static void OnFailureCallback_68(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_68(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_68(status); } static void OnSuccessCallback_68(void * context, int64_t int64s) @@ -45477,7 +46220,7 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_69(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_69(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_69(status); } static void OnSuccessCallback_69(void * context, uint8_t enum8) @@ -45487,14 +46230,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_70(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_70(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_70(status); } static void OnSuccessCallback_70(void * context) { (static_cast(context))->OnSuccessResponse_70(); } static void OnFailureCallback_71(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_71(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_71(status); } static void OnSuccessCallback_71(void * context, uint8_t enum8) @@ -45504,14 +46247,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_72(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_72(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_72(status); } static void OnSuccessCallback_72(void * context) { (static_cast(context))->OnSuccessResponse_72(); } static void OnFailureCallback_73(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_73(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_73(status); } static void OnSuccessCallback_73(void * context, uint8_t enum8) @@ -45521,7 +46264,7 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_74(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_74(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_74(status); } static void OnSuccessCallback_74(void * context, uint16_t enum16) @@ -45531,14 +46274,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_75(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_75(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_75(status); } static void OnSuccessCallback_75(void * context) { (static_cast(context))->OnSuccessResponse_75(); } static void OnFailureCallback_76(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_76(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_76(status); } static void OnSuccessCallback_76(void * context, uint16_t enum16) @@ -45548,14 +46291,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_77(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_77(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_77(status); } static void OnSuccessCallback_77(void * context) { (static_cast(context))->OnSuccessResponse_77(); } static void OnFailureCallback_78(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_78(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_78(status); } static void OnSuccessCallback_78(void * context, uint16_t enum16) @@ -45565,7 +46308,7 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_79(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_79(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_79(status); } static void OnSuccessCallback_79(void * context, uint64_t epochUs) @@ -45575,14 +46318,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_80(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_80(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_80(status); } static void OnSuccessCallback_80(void * context) { (static_cast(context))->OnSuccessResponse_80(); } static void OnFailureCallback_81(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_81(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_81(status); } static void OnSuccessCallback_81(void * context, uint64_t epochUs) @@ -45592,14 +46335,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_82(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_82(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_82(status); } static void OnSuccessCallback_82(void * context) { (static_cast(context))->OnSuccessResponse_82(); } static void OnFailureCallback_83(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_83(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_83(status); } static void OnSuccessCallback_83(void * context, uint64_t epochUs) @@ -45609,7 +46352,7 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_84(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_84(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_84(status); } static void OnSuccessCallback_84(void * context, uint32_t epochS) @@ -45619,14 +46362,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_85(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_85(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_85(status); } static void OnSuccessCallback_85(void * context) { (static_cast(context))->OnSuccessResponse_85(); } static void OnFailureCallback_86(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_86(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_86(status); } static void OnSuccessCallback_86(void * context, uint32_t epochS) @@ -45636,14 +46379,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_87(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_87(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_87(status); } static void OnSuccessCallback_87(void * context) { (static_cast(context))->OnSuccessResponse_87(); } static void OnFailureCallback_88(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_88(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_88(status); } static void OnSuccessCallback_88(void * context, uint32_t epochS) @@ -45653,7 +46396,7 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_89(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_89(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_89(status); } static void OnSuccessCallback_89(void * context, chip::VendorId vendorId) @@ -45663,14 +46406,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_90(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_90(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_90(status); } static void OnSuccessCallback_90(void * context) { (static_cast(context))->OnSuccessResponse_90(); } static void OnFailureCallback_91(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_91(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_91(status); } static void OnSuccessCallback_91(void * context, chip::VendorId vendorId) @@ -45680,14 +46423,14 @@ class TestSaveAs : public TestCommand static void OnFailureCallback_92(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_92(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_92(status); } static void OnSuccessCallback_92(void * context) { (static_cast(context))->OnSuccessResponse_92(); } static void OnFailureCallback_93(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_93(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_93(status); } static void OnSuccessCallback_93(void * context, chip::VendorId vendorId) @@ -45726,7 +46469,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint8_t returnValue) { @@ -45757,7 +46500,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint8_t returnValue) { @@ -45787,7 +46530,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint8_t returnValue) { @@ -45802,11 +46545,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_4, - OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(bool boolean) { @@ -45830,7 +46574,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5() { NextTest(); } @@ -45840,11 +46584,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_6, - OnFailureCallback_6); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_6, OnFailureCallback_6)); + return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(bool boolean) { @@ -45867,7 +46612,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7() { NextTest(); } @@ -45877,11 +46622,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_8, - OnFailureCallback_8); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_8, OnFailureCallback_8)); + return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(bool boolean) { @@ -45896,11 +46642,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_9, - OnFailureCallback_9); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_9, OnFailureCallback_9)); + return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9(uint8_t bitmap8) { @@ -45924,7 +46671,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10() { NextTest(); } @@ -45934,11 +46681,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_11, - OnFailureCallback_11); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_11, OnFailureCallback_11)); + return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11(uint8_t bitmap8) { @@ -45961,7 +46709,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_12(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_12() { NextTest(); } @@ -45971,11 +46719,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_13, - OnFailureCallback_13); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_13, OnFailureCallback_13)); + return CHIP_NO_ERROR; } - void OnFailureResponse_13(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_13(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_13(uint8_t bitmap8) { @@ -45990,11 +46739,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_14, - OnFailureCallback_14); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_14, OnFailureCallback_14)); + return CHIP_NO_ERROR; } - void OnFailureResponse_14(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_14(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_14(uint16_t bitmap16) { @@ -46018,7 +46768,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_15(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_15(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_15() { NextTest(); } @@ -46028,11 +46778,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_16, - OnFailureCallback_16); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_16, OnFailureCallback_16)); + return CHIP_NO_ERROR; } - void OnFailureResponse_16(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_16(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_16(uint16_t bitmap16) { @@ -46055,7 +46806,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_17(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_17(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_17() { NextTest(); } @@ -46065,11 +46816,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_18, - OnFailureCallback_18); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_18, OnFailureCallback_18)); + return CHIP_NO_ERROR; } - void OnFailureResponse_18(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_18(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_18(uint16_t bitmap16) { @@ -46084,11 +46836,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_19, - OnFailureCallback_19); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_19, OnFailureCallback_19)); + return CHIP_NO_ERROR; } - void OnFailureResponse_19(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_19(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_19(uint32_t bitmap32) { @@ -46112,7 +46865,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_20(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_20(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_20() { NextTest(); } @@ -46122,11 +46875,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_21, - OnFailureCallback_21); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_21, OnFailureCallback_21)); + return CHIP_NO_ERROR; } - void OnFailureResponse_21(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_21(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_21(uint32_t bitmap32) { @@ -46149,7 +46903,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_22(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_22(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_22() { NextTest(); } @@ -46159,11 +46913,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_23, - OnFailureCallback_23); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_23, OnFailureCallback_23)); + return CHIP_NO_ERROR; } - void OnFailureResponse_23(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_23(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_23(uint32_t bitmap32) { @@ -46178,11 +46933,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_24, - OnFailureCallback_24); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_24, OnFailureCallback_24)); + return CHIP_NO_ERROR; } - void OnFailureResponse_24(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_24(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_24(uint64_t bitmap64) { @@ -46206,7 +46962,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_25(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_25(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_25() { NextTest(); } @@ -46216,11 +46972,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_26, - OnFailureCallback_26); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_26, OnFailureCallback_26)); + return CHIP_NO_ERROR; } - void OnFailureResponse_26(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_26(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_26(uint64_t bitmap64) { @@ -46243,7 +47000,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_27(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_27(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_27() { NextTest(); } @@ -46253,11 +47010,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_28, - OnFailureCallback_28); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_28, OnFailureCallback_28)); + return CHIP_NO_ERROR; } - void OnFailureResponse_28(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_28(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_28(uint64_t bitmap64) { @@ -46272,11 +47030,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_29, - OnFailureCallback_29); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_29, OnFailureCallback_29)); + return CHIP_NO_ERROR; } - void OnFailureResponse_29(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_29(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_29(uint8_t int8u) { @@ -46300,7 +47059,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_30(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_30(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_30() { NextTest(); } @@ -46310,11 +47069,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_31, - OnFailureCallback_31); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_31, OnFailureCallback_31)); + return CHIP_NO_ERROR; } - void OnFailureResponse_31(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_31(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_31(uint8_t int8u) { @@ -46337,7 +47097,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_32(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_32(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_32() { NextTest(); } @@ -46347,11 +47107,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_33, - OnFailureCallback_33); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_33, OnFailureCallback_33)); + return CHIP_NO_ERROR; } - void OnFailureResponse_33(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_33(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_33(uint8_t int8u) { @@ -46366,11 +47127,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_34, - OnFailureCallback_34); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_34, OnFailureCallback_34)); + return CHIP_NO_ERROR; } - void OnFailureResponse_34(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_34(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_34(uint16_t int16u) { @@ -46394,7 +47156,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_35(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_35(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_35() { NextTest(); } @@ -46404,11 +47166,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_36, - OnFailureCallback_36); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_36, OnFailureCallback_36)); + return CHIP_NO_ERROR; } - void OnFailureResponse_36(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_36(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_36(uint16_t int16u) { @@ -46431,7 +47194,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_37(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_37(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_37() { NextTest(); } @@ -46441,11 +47204,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_38, - OnFailureCallback_38); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_38, OnFailureCallback_38)); + return CHIP_NO_ERROR; } - void OnFailureResponse_38(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_38(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_38(uint16_t int16u) { @@ -46460,11 +47224,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_39, - OnFailureCallback_39); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_39, OnFailureCallback_39)); + return CHIP_NO_ERROR; } - void OnFailureResponse_39(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_39(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_39(uint32_t int32u) { @@ -46488,7 +47253,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_40(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_40(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_40() { NextTest(); } @@ -46498,11 +47263,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_41, - OnFailureCallback_41); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_41, OnFailureCallback_41)); + return CHIP_NO_ERROR; } - void OnFailureResponse_41(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_41(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_41(uint32_t int32u) { @@ -46525,7 +47291,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_42(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_42(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_42() { NextTest(); } @@ -46535,11 +47301,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_43, - OnFailureCallback_43); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_43, OnFailureCallback_43)); + return CHIP_NO_ERROR; } - void OnFailureResponse_43(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_43(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_43(uint32_t int32u) { @@ -46554,11 +47321,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_44, - OnFailureCallback_44); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_44, OnFailureCallback_44)); + return CHIP_NO_ERROR; } - void OnFailureResponse_44(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_44(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_44(uint64_t int64u) { @@ -46582,7 +47350,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_45(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_45(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_45() { NextTest(); } @@ -46592,11 +47360,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_46, - OnFailureCallback_46); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_46, OnFailureCallback_46)); + return CHIP_NO_ERROR; } - void OnFailureResponse_46(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_46(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_46(uint64_t int64u) { @@ -46619,7 +47388,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_47(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_47(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_47() { NextTest(); } @@ -46629,11 +47398,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_48, - OnFailureCallback_48); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_48, OnFailureCallback_48)); + return CHIP_NO_ERROR; } - void OnFailureResponse_48(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_48(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_48(uint64_t int64u) { @@ -46648,11 +47418,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_49, - OnFailureCallback_49); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_49, OnFailureCallback_49)); + return CHIP_NO_ERROR; } - void OnFailureResponse_49(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_49(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_49(int8_t int8s) { @@ -46676,7 +47447,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_50(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_50(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_50() { NextTest(); } @@ -46686,11 +47457,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_51, - OnFailureCallback_51); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_51, OnFailureCallback_51)); + return CHIP_NO_ERROR; } - void OnFailureResponse_51(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_51(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_51(int8_t int8s) { @@ -46713,7 +47485,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_52(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_52(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_52() { NextTest(); } @@ -46723,11 +47495,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_53, - OnFailureCallback_53); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_53, OnFailureCallback_53)); + return CHIP_NO_ERROR; } - void OnFailureResponse_53(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_53(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_53(int8_t int8s) { @@ -46742,11 +47515,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_54, - OnFailureCallback_54); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_54, OnFailureCallback_54)); + return CHIP_NO_ERROR; } - void OnFailureResponse_54(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_54(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_54(int16_t int16s) { @@ -46770,7 +47544,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_55(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_55(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_55() { NextTest(); } @@ -46780,11 +47554,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_56, - OnFailureCallback_56); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_56, OnFailureCallback_56)); + return CHIP_NO_ERROR; } - void OnFailureResponse_56(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_56(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_56(int16_t int16s) { @@ -46807,7 +47582,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_57(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_57(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_57() { NextTest(); } @@ -46817,11 +47592,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_58, - OnFailureCallback_58); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_58, OnFailureCallback_58)); + return CHIP_NO_ERROR; } - void OnFailureResponse_58(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_58(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_58(int16_t int16s) { @@ -46836,11 +47612,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_59, - OnFailureCallback_59); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_59, OnFailureCallback_59)); + return CHIP_NO_ERROR; } - void OnFailureResponse_59(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_59(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_59(int32_t int32s) { @@ -46864,7 +47641,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_60(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_60(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_60() { NextTest(); } @@ -46874,11 +47651,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_61, - OnFailureCallback_61); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_61, OnFailureCallback_61)); + return CHIP_NO_ERROR; } - void OnFailureResponse_61(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_61(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_61(int32_t int32s) { @@ -46901,7 +47679,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_62(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_62(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_62() { NextTest(); } @@ -46911,11 +47689,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_63, - OnFailureCallback_63); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_63, OnFailureCallback_63)); + return CHIP_NO_ERROR; } - void OnFailureResponse_63(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_63(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_63(int32_t int32s) { @@ -46930,11 +47709,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_64, - OnFailureCallback_64); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_64, OnFailureCallback_64)); + return CHIP_NO_ERROR; } - void OnFailureResponse_64(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_64(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_64(int64_t int64s) { @@ -46958,7 +47738,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_65(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_65(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_65() { NextTest(); } @@ -46968,11 +47748,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_66, - OnFailureCallback_66); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_66, OnFailureCallback_66)); + return CHIP_NO_ERROR; } - void OnFailureResponse_66(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_66(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_66(int64_t int64s) { @@ -46995,7 +47776,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_67(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_67(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_67() { NextTest(); } @@ -47005,11 +47786,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_68, - OnFailureCallback_68); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_68, OnFailureCallback_68)); + return CHIP_NO_ERROR; } - void OnFailureResponse_68(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_68(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_68(int64_t int64s) { @@ -47024,11 +47806,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_69, - OnFailureCallback_69); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_69, OnFailureCallback_69)); + return CHIP_NO_ERROR; } - void OnFailureResponse_69(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_69(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_69(uint8_t enum8) { @@ -47052,7 +47835,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_70(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_70(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_70() { NextTest(); } @@ -47062,11 +47845,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_71, - OnFailureCallback_71); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_71, OnFailureCallback_71)); + return CHIP_NO_ERROR; } - void OnFailureResponse_71(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_71(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_71(uint8_t enum8) { @@ -47089,7 +47873,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_72(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_72(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_72() { NextTest(); } @@ -47099,11 +47883,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_73, - OnFailureCallback_73); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_73, OnFailureCallback_73)); + return CHIP_NO_ERROR; } - void OnFailureResponse_73(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_73(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_73(uint8_t enum8) { @@ -47118,11 +47903,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_74, - OnFailureCallback_74); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_74, OnFailureCallback_74)); + return CHIP_NO_ERROR; } - void OnFailureResponse_74(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_74(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_74(uint16_t enum16) { @@ -47146,7 +47932,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_75(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_75(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_75() { NextTest(); } @@ -47156,11 +47942,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_76, - OnFailureCallback_76); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_76, OnFailureCallback_76)); + return CHIP_NO_ERROR; } - void OnFailureResponse_76(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_76(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_76(uint16_t enum16) { @@ -47183,7 +47970,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_77(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_77(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_77() { NextTest(); } @@ -47193,11 +47980,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_78, - OnFailureCallback_78); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_78, OnFailureCallback_78)); + return CHIP_NO_ERROR; } - void OnFailureResponse_78(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_78(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_78(uint16_t enum16) { @@ -47212,11 +48000,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_79, - OnFailureCallback_79); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_79, OnFailureCallback_79)); + return CHIP_NO_ERROR; } - void OnFailureResponse_79(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_79(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_79(uint64_t epochUs) { @@ -47240,7 +48029,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_80(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_80(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_80() { NextTest(); } @@ -47250,11 +48039,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_81, - OnFailureCallback_81); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_81, OnFailureCallback_81)); + return CHIP_NO_ERROR; } - void OnFailureResponse_81(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_81(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_81(uint64_t epochUs) { @@ -47277,7 +48067,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_82(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_82(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_82() { NextTest(); } @@ -47287,11 +48077,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_83, - OnFailureCallback_83); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_83, OnFailureCallback_83)); + return CHIP_NO_ERROR; } - void OnFailureResponse_83(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_83(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_83(uint64_t epochUs) { @@ -47306,11 +48097,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_84, - OnFailureCallback_84); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_84, OnFailureCallback_84)); + return CHIP_NO_ERROR; } - void OnFailureResponse_84(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_84(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_84(uint32_t epochS) { @@ -47334,7 +48126,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_85(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_85(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_85() { NextTest(); } @@ -47344,11 +48136,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_86, - OnFailureCallback_86); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_86, OnFailureCallback_86)); + return CHIP_NO_ERROR; } - void OnFailureResponse_86(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_86(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_86(uint32_t epochS) { @@ -47371,7 +48164,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_87(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_87(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_87() { NextTest(); } @@ -47381,11 +48174,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_88, - OnFailureCallback_88); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_88, OnFailureCallback_88)); + return CHIP_NO_ERROR; } - void OnFailureResponse_88(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_88(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_88(uint32_t epochS) { @@ -47400,11 +48194,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_89, - OnFailureCallback_89); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_89, OnFailureCallback_89)); + return CHIP_NO_ERROR; } - void OnFailureResponse_89(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_89(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_89(chip::VendorId vendorId) { @@ -47428,7 +48223,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_90(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_90(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_90() { NextTest(); } @@ -47438,11 +48233,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_91, - OnFailureCallback_91); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_91, OnFailureCallback_91)); + return CHIP_NO_ERROR; } - void OnFailureResponse_91(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_91(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_91(chip::VendorId vendorId) { @@ -47465,7 +48261,7 @@ class TestSaveAs : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_92(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_92(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_92() { NextTest(); } @@ -47475,11 +48271,12 @@ class TestSaveAs : public TestCommand chip::Controller::TestClusterClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_93, - OnFailureCallback_93); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_93, OnFailureCallback_93)); + return CHIP_NO_ERROR; } - void OnFailureResponse_93(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_93(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_93(chip::VendorId vendorId) { @@ -47554,7 +48351,7 @@ class TestDescriptorCluster : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1( @@ -47566,7 +48363,7 @@ class TestDescriptorCluster : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, const chip::app::DataModel::DecodableList & serverList) @@ -47576,7 +48373,7 @@ class TestDescriptorCluster : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, const chip::app::DataModel::DecodableList & clientList) @@ -47586,7 +48383,7 @@ class TestDescriptorCluster : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, const chip::app::DataModel::DecodableList & partsList) @@ -47610,11 +48407,12 @@ class TestDescriptorCluster : public TestCommand chip::Controller::DescriptorClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_1, - OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1( const chip::app::DataModel::DecodableList & deviceList) @@ -47634,11 +48432,12 @@ class TestDescriptorCluster : public TestCommand chip::Controller::DescriptorClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(const chip::app::DataModel::DecodableList & serverList) { @@ -47696,11 +48495,12 @@ class TestDescriptorCluster : public TestCommand chip::Controller::DescriptorClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_3, - OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(const chip::app::DataModel::DecodableList & clientList) { @@ -47716,11 +48516,12 @@ class TestDescriptorCluster : public TestCommand chip::Controller::DescriptorClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_4, - OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(const chip::app::DataModel::DecodableList & partsList) { @@ -47804,7 +48605,7 @@ class TestBasicInformation : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, chip::CharSpan location) @@ -47814,14 +48615,14 @@ class TestBasicInformation : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context) { (static_cast(context))->OnSuccessResponse_2(); } static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, chip::CharSpan location) @@ -47831,14 +48632,14 @@ class TestBasicInformation : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context) { (static_cast(context))->OnSuccessResponse_4(); } static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5(void * context, const chip::app::DataModel::DecodableList & attributeList) @@ -47862,11 +48663,12 @@ class TestBasicInformation : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_1, - OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(chip::CharSpan location) { @@ -47889,7 +48691,7 @@ class TestBasicInformation : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2() { NextTest(); } @@ -47899,11 +48701,12 @@ class TestBasicInformation : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_3, - OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(chip::CharSpan location) { @@ -47926,7 +48729,7 @@ class TestBasicInformation : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -47936,11 +48739,12 @@ class TestBasicInformation : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_5, - OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(const chip::app::DataModel::DecodableList & attributeList) { @@ -48074,7 +48878,7 @@ class TestIdentifyCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } }; @@ -48260,7 +49064,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint8_t status, uint16_t groupId, chip::CharSpan groupName) { @@ -48291,7 +49095,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint8_t status, uint16_t groupId, chip::CharSpan groupName) { @@ -48323,7 +49127,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint8_t status, uint16_t groupId) { @@ -48354,7 +49158,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(uint8_t status, uint16_t groupId, chip::CharSpan groupName) { @@ -48387,7 +49191,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(uint8_t status, uint16_t groupId, chip::CharSpan groupName) { @@ -48419,7 +49223,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6(uint8_t capacity, const chip::app::DataModel::DecodableList & groupList) { @@ -48454,7 +49258,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(uint8_t status, uint16_t groupId) { @@ -48485,7 +49289,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_8(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_8(uint8_t status, uint16_t groupId, chip::CharSpan groupName) { @@ -48518,7 +49322,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_9(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_9(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_9(uint8_t status, uint16_t groupId, chip::CharSpan groupName) { @@ -48550,7 +49354,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_10(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_10(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_10(uint8_t status, uint16_t groupId) { @@ -48581,7 +49385,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_11(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_11(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_11(uint8_t status, uint16_t groupId, chip::CharSpan groupName) { @@ -48614,7 +49418,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_12(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_12(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_12(uint8_t status, uint16_t groupId, chip::CharSpan groupName) { @@ -48652,7 +49456,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_13(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_13(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_13(uint8_t capacity, const chip::app::DataModel::DecodableList & groupList) { @@ -48686,7 +49490,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_14(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_14(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_14(uint8_t status, uint16_t groupId, chip::CharSpan groupName) { @@ -48719,7 +49523,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_15(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_15(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_15(uint8_t status, uint16_t groupId) { @@ -48750,7 +49554,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_16(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_16(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_16(uint8_t status, uint16_t groupId) { @@ -48781,7 +49585,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_17(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_17(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_17(uint8_t status, uint16_t groupId) { @@ -48812,7 +49616,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_18(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_18(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_18(uint8_t status, uint16_t groupId, chip::CharSpan groupName) { @@ -48845,7 +49649,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_19(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_19(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_19(uint8_t status, uint16_t groupId, chip::CharSpan groupName) { @@ -48876,7 +49680,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_20(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_20(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_20(uint8_t status, uint16_t groupId, chip::CharSpan groupName) { @@ -48915,7 +49719,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_21(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_21(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_21(uint8_t capacity, const chip::app::DataModel::DecodableList & groupList) { @@ -48948,7 +49752,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_22(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_22(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_22() { NextTest(); } @@ -48972,7 +49776,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_23(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_23(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_23(uint8_t status, uint16_t groupId, chip::CharSpan groupName) { @@ -49003,7 +49807,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_24(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_24(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_24(uint8_t status, uint16_t groupId, chip::CharSpan groupName) { @@ -49034,7 +49838,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_25(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_25(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_25(uint8_t status, uint16_t groupId, chip::CharSpan groupName) { @@ -49072,7 +49876,7 @@ class TestGroupsCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_26(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_26(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_26(uint8_t capacity, const chip::app::DataModel::DecodableList & groupList) { @@ -49146,7 +49950,7 @@ class TestOperationalCredentialsCluster : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint8_t supportedFabrics) @@ -49156,7 +49960,7 @@ class TestOperationalCredentialsCluster : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint8_t commissionedFabrics) @@ -49166,7 +49970,7 @@ class TestOperationalCredentialsCluster : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, chip::FabricIndex currentFabricIndex) @@ -49190,11 +49994,13 @@ class TestOperationalCredentialsCluster : public TestCommand chip::Controller::OperationalCredentialsClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint8_t supportedFabrics) { @@ -49210,11 +50016,13 @@ class TestOperationalCredentialsCluster : public TestCommand chip::Controller::OperationalCredentialsClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint8_t commissionedFabrics) { @@ -49230,11 +50038,13 @@ class TestOperationalCredentialsCluster : public TestCommand chip::Controller::OperationalCredentialsClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(chip::FabricIndex currentFabricIndex) { @@ -49326,7 +50136,7 @@ class TestModeSelectCluster : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint8_t currentMode) @@ -49336,7 +50146,7 @@ class TestModeSelectCluster : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint8_t onMode) @@ -49346,7 +50156,7 @@ class TestModeSelectCluster : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint8_t startUpMode) @@ -49356,7 +50166,7 @@ class TestModeSelectCluster : public TestCommand static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, chip::CharSpan description) @@ -49366,7 +50176,7 @@ class TestModeSelectCluster : public TestCommand static void OnFailureCallback_5(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_5(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_5(status); } static void OnSuccessCallback_5( @@ -49379,7 +50189,7 @@ class TestModeSelectCluster : public TestCommand static void OnFailureCallback_7(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_7(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_7(status); } static void OnSuccessCallback_7(void * context, uint8_t currentMode) @@ -49403,11 +50213,12 @@ class TestModeSelectCluster : public TestCommand chip::Controller::ModeSelectClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_1, - OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1(uint8_t currentMode) { @@ -49422,11 +50233,12 @@ class TestModeSelectCluster : public TestCommand chip::Controller::ModeSelectClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(uint8_t onMode) { @@ -49441,11 +50253,12 @@ class TestModeSelectCluster : public TestCommand chip::Controller::ModeSelectClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_3, - OnFailureCallback_3); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3(uint8_t startUpMode) { @@ -49460,11 +50273,12 @@ class TestModeSelectCluster : public TestCommand chip::Controller::ModeSelectClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_4, - OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(chip::CharSpan description) { @@ -49479,11 +50293,12 @@ class TestModeSelectCluster : public TestCommand chip::Controller::ModeSelectClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_5, OnFailureCallback_5); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_5, OnFailureCallback_5)); + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5( const chip::app::DataModel::DecodableList & @@ -49527,7 +50342,7 @@ class TestModeSelectCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6() { NextTest(); } @@ -49537,11 +50352,12 @@ class TestModeSelectCluster : public TestCommand chip::Controller::ModeSelectClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_7, - OnFailureCallback_7); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_7, OnFailureCallback_7)); + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(uint8_t currentMode) { @@ -49570,7 +50386,7 @@ class TestModeSelectCluster : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_8(uint8_t status) + void OnFailureResponse_8(EmberAfStatus status) { VerifyOrReturn(CheckValue("status", status, EMBER_ZCL_STATUS_CONSTRAINT_ERROR)); NextTest(); @@ -49642,18 +50458,18 @@ class TestGroupMessaging : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 5; + static void OnDoneCallback_1(void * context) { (static_cast(context))->OnDoneResponse_1(); } + static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } - static void OnDoneCallback_1(void * context) { (static_cast(context))->OnDoneResponse_1(); } - static void OnSuccessCallback_1(void * context) { (static_cast(context))->OnSuccessResponse_1(); } static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, chip::CharSpan location) @@ -49661,18 +50477,18 @@ class TestGroupMessaging : public TestCommand (static_cast(context))->OnSuccessResponse_2(location); } + static void OnDoneCallback_3(void * context) { (static_cast(context))->OnDoneResponse_3(); } + static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } - static void OnDoneCallback_3(void * context) { (static_cast(context))->OnDoneResponse_3(); } - static void OnSuccessCallback_3(void * context) { (static_cast(context))->OnSuccessResponse_3(); } static void OnFailureCallback_4(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_4(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_4(status); } static void OnSuccessCallback_4(void * context, chip::CharSpan location) @@ -49704,7 +50520,7 @@ class TestGroupMessaging : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -49716,11 +50532,12 @@ class TestGroupMessaging : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_2, - OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(chip::CharSpan location) { @@ -49743,7 +50560,7 @@ class TestGroupMessaging : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_3() { NextTest(); } @@ -49755,11 +50572,12 @@ class TestGroupMessaging : public TestCommand chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute(this, OnSuccessCallback_4, - OnFailureCallback_4); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_4, OnFailureCallback_4)); + return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4(chip::CharSpan location) { @@ -49831,7 +50649,7 @@ class Test_TC_DIAGSW_1_1 : public TestCommand static void OnFailureCallback_1(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_1(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_1(status); } static void OnSuccessCallback_1(void * context, uint64_t currentHeapFree) @@ -49841,7 +50659,7 @@ class Test_TC_DIAGSW_1_1 : public TestCommand static void OnFailureCallback_2(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_2(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_2(status); } static void OnSuccessCallback_2(void * context, uint64_t currentHeapUsed) @@ -49851,7 +50669,7 @@ class Test_TC_DIAGSW_1_1 : public TestCommand static void OnFailureCallback_3(void * context, EmberAfStatus status) { - (static_cast(context))->OnFailureResponse_3(chip::to_underlying(status)); + (static_cast(context))->OnFailureResponse_3(status); } static void OnSuccessCallback_3(void * context, uint64_t currentHeapHighWatermark) @@ -49875,11 +50693,12 @@ class Test_TC_DIAGSW_1_1 : public TestCommand chip::Controller::SoftwareDiagnosticsClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_1, OnFailureCallback_1); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_1, OnFailureCallback_1)); + return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) + void OnFailureResponse_1(EmberAfStatus status) { (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) ? NextTest() : ThrowFailureResponse(); } @@ -49897,11 +50716,12 @@ class Test_TC_DIAGSW_1_1 : public TestCommand chip::Controller::SoftwareDiagnosticsClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_2, OnFailureCallback_2); + ReturnErrorOnFailure(cluster.ReadAttribute( + this, OnSuccessCallback_2, OnFailureCallback_2)); + return CHIP_NO_ERROR; } - void OnFailureResponse_2(uint8_t status) + void OnFailureResponse_2(EmberAfStatus status) { (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) ? NextTest() : ThrowFailureResponse(); } @@ -49919,11 +50739,13 @@ class Test_TC_DIAGSW_1_1 : public TestCommand chip::Controller::SoftwareDiagnosticsClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReadAttribute( - this, OnSuccessCallback_3, OnFailureCallback_3); + ReturnErrorOnFailure( + cluster.ReadAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) + void OnFailureResponse_3(EmberAfStatus status) { (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) ? NextTest() : ThrowFailureResponse(); } @@ -50117,16 +50939,10 @@ class TestSubscribe_OnOff : public TestCommand std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 8; - chip::Callback::Callback mOnFailureCallback_2{ OnFailureCallback_2, this }; - chip::Callback::Callback mOnSuccessCallback_2{ OnSuccessCallback_2, this }; - chip::Callback::Callback mOnFailureCallback_3{ OnFailureCallback_3, this }; - chip::Callback::Callback mOnSuccessCallback_3{ OnSuccessCallback_3, this }; - chip::Callback::Callback mOnFailureCallback_5{ OnFailureCallback_5, this }; - chip::Callback::Callback mOnSuccessCallback_5{ OnSuccessCallback_5, this }; - chip::Callback::Callback mOnFailureCallback_7{ OnFailureCallback_7, this }; - chip::Callback::Callback mOnSuccessCallback_7{ OnSuccessCallback_7, this }; + typedef void (*Test_TestSubscribe_OnOff_OnOff_ReportCallback)(void * context, bool value); + Test_TestSubscribe_OnOff_OnOff_ReportCallback mTest_TestSubscribe_OnOff_OnOff_Reported = nullptr; - static void OnFailureCallback_2(void * context, uint8_t status) + static void OnFailureCallback_2(void * context, EmberAfStatus status) { (static_cast(context))->OnFailureResponse_2(status); } @@ -50138,7 +50954,7 @@ class TestSubscribe_OnOff : public TestCommand bool mReceivedReport_2 = false; - static void OnFailureCallback_3(void * context, uint8_t status) + static void OnFailureCallback_3(void * context, EmberAfStatus status) { (static_cast(context))->OnFailureResponse_3(status); } @@ -50148,7 +50964,12 @@ class TestSubscribe_OnOff : public TestCommand (static_cast(context))->OnSuccessResponse_3(onOff); } - static void OnFailureCallback_5(void * context, uint8_t status) + static void OnSubscriptionEstablished_3(void * context) + { + (static_cast(context))->OnSubscriptionEstablishedResponse_3(); + } + + static void OnFailureCallback_5(void * context, EmberAfStatus status) { (static_cast(context))->OnFailureResponse_5(status); } @@ -50160,7 +50981,7 @@ class TestSubscribe_OnOff : public TestCommand bool mReceivedReport_5 = false; - static void OnFailureCallback_7(void * context, uint8_t status) + static void OnFailureCallback_7(void * context, EmberAfStatus status) { (static_cast(context))->OnFailureResponse_7(status); } @@ -50201,7 +51022,7 @@ class TestSubscribe_OnOff : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_1(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_1(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_1() { NextTest(); } @@ -50211,16 +51032,14 @@ class TestSubscribe_OnOff : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - ReturnErrorOnFailure(cluster.ReportAttributeOnOff(mOnSuccessCallback_2.Cancel())); - + mTest_TestSubscribe_OnOff_OnOff_Reported = OnSuccessCallback_2; return WaitForMs(0); } - void OnFailureResponse_2(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_2(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_2(bool onOff) { - VerifyOrReturn(mReceivedReport_2 == false, ChipLogError(chipTool, "Not Fatal: on report called more than once.")); mReceivedReport_2 = true; VerifyOrReturn(CheckValue("onOff", onOff, false)); @@ -50237,16 +51056,26 @@ class TestSubscribe_OnOff : public TestCommand uint16_t maxIntervalArgument; maxIntervalArgument = 10U; - return cluster.SubscribeAttributeOnOff(mOnSuccessCallback_3.Cancel(), mOnFailureCallback_3.Cancel(), minIntervalArgument, - maxIntervalArgument); + ReturnErrorOnFailure(cluster.SubscribeAttribute( + this, OnSuccessCallback_3, OnFailureCallback_3, minIntervalArgument, maxIntervalArgument, OnSubscriptionEstablished_3)); + return CHIP_NO_ERROR; } - void OnFailureResponse_3(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_3(EmberAfStatus status) { ThrowFailureResponse(); } - void OnSuccessResponse_3(bool onOff) + void OnSuccessResponse_3(bool value) { - VerifyOrReturn(mReceivedReport_2, Exit("Initial report not received!")); + if (mTest_TestSubscribe_OnOff_OnOff_Reported) + { + auto callback = mTest_TestSubscribe_OnOff_OnOff_Reported; + mTest_TestSubscribe_OnOff_OnOff_Reported = nullptr; + callback(this, value); + } + } + void OnSubscriptionEstablishedResponse_3() + { + VerifyOrReturn(mReceivedReport_2, Exit("Initial report not received!")); NextTest(); } @@ -50269,7 +51098,7 @@ class TestSubscribe_OnOff : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_4(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_4(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_4() { NextTest(); } @@ -50279,14 +51108,14 @@ class TestSubscribe_OnOff : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReportAttributeOnOff(mOnSuccessCallback_5.Cancel()); + mTest_TestSubscribe_OnOff_OnOff_Reported = OnSuccessCallback_5; + return CHIP_NO_ERROR; } - void OnFailureResponse_5(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_5(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_5(bool onOff) { - VerifyOrReturn(mReceivedReport_5 == false, ChipLogError(chipTool, "Not Fatal: on report called more than once.")); mReceivedReport_5 = true; VerifyOrReturn(CheckValue("onOff", onOff, true)); @@ -50313,7 +51142,7 @@ class TestSubscribe_OnOff : public TestCommand return CHIP_NO_ERROR; } - void OnFailureResponse_6(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_6(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_6() { NextTest(); } @@ -50323,14 +51152,14 @@ class TestSubscribe_OnOff : public TestCommand chip::Controller::OnOffClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - return cluster.ReportAttributeOnOff(mOnSuccessCallback_7.Cancel()); + mTest_TestSubscribe_OnOff_OnOff_Reported = OnSuccessCallback_7; + return CHIP_NO_ERROR; } - void OnFailureResponse_7(uint8_t status) { ThrowFailureResponse(); } + void OnFailureResponse_7(EmberAfStatus status) { ThrowFailureResponse(); } void OnSuccessResponse_7(bool onOff) { - VerifyOrReturn(mReceivedReport_7 == false, ChipLogError(chipTool, "Not Fatal: on report called more than once.")); mReceivedReport_7 = true; VerifyOrReturn(CheckValue("onOff", onOff, false));