From 1dd58c0acb1bf45a4ca4c8bdb3548bc0795b9488 Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Thu, 21 Oct 2021 14:46:04 +0200 Subject: [PATCH] Remove some usage of cluster-id.h to use ids/Clusters.h instead (#10658) --- examples/bridge-app/linux/include/Device.h | 6 ------ examples/common/pigweed/rpc_services/Locking.h | 9 +++------ .../linux/include/wake-on-lan/WakeOnLanManager.cpp | 11 +++++------ .../binary-input-server/binary-input-server.cpp | 13 +++++++------ .../keypad-input-server/keypad-input-server.cpp | 8 +++++--- .../power-source-server/power-source-server.cpp | 4 ---- .../pump-configuration-and-control-client.cpp | 4 ---- .../target-navigator-server.cpp | 6 ++++-- .../thermostat-client/thermostat-client.cpp | 3 --- 9 files changed, 24 insertions(+), 40 deletions(-) diff --git a/examples/bridge-app/linux/include/Device.h b/examples/bridge-app/linux/include/Device.h index fd99f03651842c..257fb8ec34aedb 100644 --- a/examples/bridge-app/linux/include/Device.h +++ b/examples/bridge-app/linux/include/Device.h @@ -18,13 +18,7 @@ #pragma once -//#include -//#include -//#include -//#include -//#include #include -//#include #include #include diff --git a/examples/common/pigweed/rpc_services/Locking.h b/examples/common/pigweed/rpc_services/Locking.h index 53c7c2cacac965..af9d577ca3473a 100644 --- a/examples/common/pigweed/rpc_services/Locking.h +++ b/examples/common/pigweed/rpc_services/Locking.h @@ -21,9 +21,8 @@ #include "app/util/attribute-storage.h" #include "locking_service/locking_service.rpc.pb.h" #include "pigweed/rpc_services/internal/StatusUtils.h" -#include #include -#include +#include namespace chip { namespace rpc { @@ -36,16 +35,14 @@ class Locking final : public generated::Locking virtual pw::Status Set(ServerContext &, const chip_rpc_LockingState & request, pw_protobuf_Empty & response) { uint8_t locked = request.locked; - RETURN_STATUS_IF_NOT_OK(emberAfWriteServerAttribute(kEndpoint, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, &locked, - ZCL_BOOLEAN_ATTRIBUTE_TYPE)); + RETURN_STATUS_IF_NOT_OK(app::Clusters::OnOff::Attributes::OnOff::Set(kEndpoint, locked)); return pw::OkStatus(); } virtual pw::Status Get(ServerContext &, const pw_protobuf_Empty & request, chip_rpc_LockingState & response) { uint8_t locked; - RETURN_STATUS_IF_NOT_OK( - emberAfReadServerAttribute(kEndpoint, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, &locked, sizeof(locked))); + RETURN_STATUS_IF_NOT_OK(app::Clusters::OnOff::Attributes::OnOff::Get(kEndpoint, &locked)); response.locked = locked; return pw::OkStatus(); } diff --git a/examples/tv-app/linux/include/wake-on-lan/WakeOnLanManager.cpp b/examples/tv-app/linux/include/wake-on-lan/WakeOnLanManager.cpp index 2158d8065bd9c6..3072b0e3928f30 100644 --- a/examples/tv-app/linux/include/wake-on-lan/WakeOnLanManager.cpp +++ b/examples/tv-app/linux/include/wake-on-lan/WakeOnLanManager.cpp @@ -18,10 +18,9 @@ #include "WakeOnLanManager.h" -#include #include -#include -#include +#include +#include #include #include #include @@ -34,6 +33,7 @@ #include using namespace chip; +using namespace chip::app::Clusters; CHIP_ERROR WakeOnLanManager::Init() { @@ -51,9 +51,8 @@ void WakeOnLanManager::store(chip::EndpointId endpoint, char macAddress[32]) uint8_t bufferMemory[32]; MutableByteSpan zclString(bufferMemory); MakeZclCharString(zclString, macAddress); - EmberAfStatus macAddressStatus = - emberAfWriteServerAttribute(endpoint, ZCL_WAKE_ON_LAN_CLUSTER_ID, ZCL_WAKE_ON_LAN_MAC_ADDRESS_ATTRIBUTE_ID, - zclString.data(), ZCL_CHAR_STRING_ATTRIBUTE_TYPE); + EmberAfStatus macAddressStatus = emberAfWriteServerAttribute( + endpoint, WakeOnLan::Id, WakeOnLan::Attributes::WakeOnLanMacAddress::Id, zclString.data(), ZCL_CHAR_STRING_ATTRIBUTE_TYPE); if (macAddressStatus != EMBER_ZCL_STATUS_SUCCESS) { ChipLogError(Zcl, "Failed to store mac address attribute."); diff --git a/src/app/clusters/binary-input-server/binary-input-server.cpp b/src/app/clusters/binary-input-server/binary-input-server.cpp index 421578fa7d34b2..74d95e5dcfb7b5 100644 --- a/src/app/clusters/binary-input-server/binary-input-server.cpp +++ b/src/app/clusters/binary-input-server/binary-input-server.cpp @@ -19,14 +19,15 @@ #include -#include #include -#include +#include +#include #include #include #include using namespace chip; +using namespace chip::app::Clusters; #ifndef emberAfBinaryInputBasicClusterPrintln #define emberAfBinaryInputBasicClusterPrintln(...) ChipLogProgress(Zcl, __VA_ARGS__); @@ -34,24 +35,24 @@ using namespace chip; EmberAfStatus emberAfBinaryInputBasicClusterGetPresentValue(EndpointId endpoint, bool * presentValue) { - return emberAfReadServerAttribute(endpoint, ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, ZCL_PRESENT_VALUE_ATTRIBUTE_ID, + return emberAfReadServerAttribute(endpoint, BinaryInputBasic::Id, BinaryInputBasic::Attributes::PresentValue::Id, (uint8_t *) presentValue, sizeof(uint8_t)); } EmberAfStatus emberAfBinaryInputBasicClusterGetOutOfService(EndpointId endpoint, bool * isOutOfService) { - return emberAfReadServerAttribute(endpoint, ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, ZCL_OUT_OF_SERVICE_ATTRIBUTE_ID, + return emberAfReadServerAttribute(endpoint, BinaryInputBasic::Id, BinaryInputBasic::Attributes::OutOfService::Id, (uint8_t *) isOutOfService, sizeof(uint8_t)); } EmberAfStatus emberAfBinaryInputBasicClusterSetPresentValueCallback(EndpointId endpoint, bool presentValue) { - return emberAfWriteServerAttribute(endpoint, ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, ZCL_PRESENT_VALUE_ATTRIBUTE_ID, + return emberAfWriteServerAttribute(endpoint, BinaryInputBasic::Id, BinaryInputBasic::Attributes::PresentValue::Id, (uint8_t *) &presentValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); } EmberAfStatus emberAfBinaryInputBasicClusterSetOutOfServiceCallback(EndpointId endpoint, bool isOutOfService) { - return emberAfWriteServerAttribute(endpoint, ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, ZCL_OUT_OF_SERVICE_ATTRIBUTE_ID, + return emberAfWriteServerAttribute(endpoint, BinaryInputBasic::Id, BinaryInputBasic::Attributes::OutOfService::Id, (uint8_t *) &isOutOfService, ZCL_BOOLEAN_ATTRIBUTE_TYPE); } diff --git a/src/app/clusters/keypad-input-server/keypad-input-server.cpp b/src/app/clusters/keypad-input-server/keypad-input-server.cpp index 18fd2636438e67..fad6834dd76c70 100644 --- a/src/app/clusters/keypad-input-server/keypad-input-server.cpp +++ b/src/app/clusters/keypad-input-server/keypad-input-server.cpp @@ -21,15 +21,17 @@ ******************************************************************************* ******************************************************************************/ -#include #include #include #include +#include +#include #include #include #include using namespace chip; +using namespace chip::app::Clusters; using namespace chip::app::Clusters::KeypadInput; EmberAfKeypadInputStatus keypadInputClusterSendKey(EmberAfKeypadInputCecKeyCode keyCode); @@ -37,8 +39,8 @@ EmberAfKeypadInputStatus keypadInputClusterSendKey(EmberAfKeypadInputCecKeyCode static void sendResponse(app::CommandHandler * command, EmberAfKeypadInputStatus keypadInputStatus) { CHIP_ERROR err = CHIP_NO_ERROR; - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ZCL_KEYPAD_INPUT_CLUSTER_ID, - ZCL_SEND_KEY_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) }; + app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, KeypadInput::Id, + KeypadInput::Commands::SendKeyResponse::Id, (app::CommandPathFlags::kEndpointIdValid) }; TLV::TLVWriter * writer = nullptr; VerifyOrExit(command != nullptr, err = CHIP_ERROR_INCORRECT_STATE); diff --git a/src/app/clusters/power-source-server/power-source-server.cpp b/src/app/clusters/power-source-server/power-source-server.cpp index 7c5b0d06ea6ca7..c298ba2ea7469e 100644 --- a/src/app/clusters/power-source-server/power-source-server.cpp +++ b/src/app/clusters/power-source-server/power-source-server.cpp @@ -34,10 +34,6 @@ #include "power-source-server.h" -#include -#include -#include -#include #include #include #include diff --git a/src/app/clusters/pump-configuration-and-control-client/pump-configuration-and-control-client.cpp b/src/app/clusters/pump-configuration-and-control-client/pump-configuration-and-control-client.cpp index ac254a8fd9c9e3..ad1fe5ccf9c1bf 100644 --- a/src/app/clusters/pump-configuration-and-control-client/pump-configuration-and-control-client.cpp +++ b/src/app/clusters/pump-configuration-and-control-client/pump-configuration-and-control-client.cpp @@ -21,10 +21,6 @@ #include #include -#include -#include -#include - using namespace chip; void emberAfPumpConfigurationAndControlClusterInitCallback(EndpointId endpoint) diff --git a/src/app/clusters/target-navigator-server/target-navigator-server.cpp b/src/app/clusters/target-navigator-server/target-navigator-server.cpp index 0bcc78f544f1f5..31af1e84b35261 100644 --- a/src/app/clusters/target-navigator-server/target-navigator-server.cpp +++ b/src/app/clusters/target-navigator-server/target-navigator-server.cpp @@ -33,6 +33,7 @@ #include using namespace chip; +using namespace chip::app::Clusters; using namespace chip::app::Clusters::TargetNavigator; TargetNavigatorResponse targetNavigatorClusterNavigateTarget(uint8_t target, std::string data); @@ -40,8 +41,9 @@ TargetNavigatorResponse targetNavigatorClusterNavigateTarget(uint8_t target, std void sendResponse(app::CommandHandler * command, TargetNavigatorResponse response) { CHIP_ERROR err = CHIP_NO_ERROR; - app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, ZCL_TARGET_NAVIGATOR_CLUSTER_ID, - ZCL_NAVIGATE_TARGET_RESPONSE_COMMAND_ID, (app::CommandPathFlags::kEndpointIdValid) }; + app::CommandPathParams cmdParams = { emberAfCurrentEndpoint(), /* group id */ 0, TargetNavigator::Id, + TargetNavigator::Commands::NavigateTargetResponse::Id, + (app::CommandPathFlags::kEndpointIdValid) }; TLV::TLVWriter * writer = nullptr; SuccessOrExit(err = command->PrepareCommand(cmdParams)); VerifyOrExit((writer = command->GetCommandDataElementTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); diff --git a/src/app/clusters/thermostat-client/thermostat-client.cpp b/src/app/clusters/thermostat-client/thermostat-client.cpp index 635a927c6d312d..31b52bf7781ee7 100644 --- a/src/app/clusters/thermostat-client/thermostat-client.cpp +++ b/src/app/clusters/thermostat-client/thermostat-client.cpp @@ -17,9 +17,6 @@ #include -#include -#include -#include #include #include #include