From 13293980005196c888a16f5d079c5b932f60c888 Mon Sep 17 00:00:00 2001 From: Tennessee Carmel-Veilleux Date: Mon, 18 Oct 2021 17:30:42 -0400 Subject: [PATCH] Improve IM logging (#10318) * Improve IM logging - Fix several typos and grammatical mistakes - Normalize command logging to be done in Data Management layer - Remove generated logging in im-cluster-command-handler.zapt since it duplicates logging that can be done one level lower (and is always done anyway) - Add more details to command responses with status - Remove nuisance log of `AttributePath is not interested` that was not actionable or useful * Restyled * Ran ZAP regen * Apply review comments: remove unneeded casts * Fix enum class cast removed by mistake * Apply suggestions from code review Co-authored-by: Boris Zbarsky * Apply review comments * Restyled * Fix build after MEI switch * Restyled * Regenerated ZAP * Restyled by autopep8 * Regenerated ZAP * Restyle Co-authored-by: Boris Zbarsky Co-authored-by: Restyled.io --- src/app/CommandHandler.cpp | 8 ++++++- src/app/CommandSender.cpp | 23 +++++++++++++++++++ src/app/InteractionModelEngine.cpp | 9 ++++---- .../tests/integration/chip_im_responder.cpp | 6 ++--- .../app/im-cluster-command-handler.zapt | 4 ---- .../zap-generated/IMClusterCommandHandler.cpp | 6 ----- .../zap-generated/IMClusterCommandHandler.cpp | 6 ----- .../zap-generated/IMClusterCommandHandler.cpp | 6 ----- .../zap-generated/IMClusterCommandHandler.cpp | 6 ----- .../zap-generated/IMClusterCommandHandler.cpp | 6 ----- .../zap-generated/IMClusterCommandHandler.cpp | 6 ----- .../zap-generated/IMClusterCommandHandler.cpp | 6 ----- .../zap-generated/IMClusterCommandHandler.cpp | 6 ----- .../zap-generated/IMClusterCommandHandler.cpp | 6 ----- .../zap-generated/IMClusterCommandHandler.cpp | 6 ----- .../zap-generated/IMClusterCommandHandler.cpp | 6 ----- .../zap-generated/IMClusterCommandHandler.cpp | 6 ----- .../zap-generated/IMClusterCommandHandler.cpp | 6 ----- .../zap-generated/IMClusterCommandHandler.cpp | 6 ----- 19 files changed, 37 insertions(+), 97 deletions(-) diff --git a/src/app/CommandHandler.cpp b/src/app/CommandHandler.cpp index 5e798c9aed7fe5..08e9d477e12ca3 100644 --- a/src/app/CommandHandler.cpp +++ b/src/app/CommandHandler.cpp @@ -115,11 +115,17 @@ CHIP_ERROR CommandHandler::ProcessCommandDataElement(CommandDataElement::Parser err = aCommandElement.GetData(&commandDataReader); if (CHIP_END_OF_TLV == err) { + ChipLogDetail(DataManagement, + "Received command without data for Endpoint=%" PRIu16 " Cluster=" ChipLogFormatMEI + " Command=" ChipLogFormatMEI, + endpointId, ChipLogValueMEI(clusterId), ChipLogValueMEI(commandId)); err = CHIP_NO_ERROR; - ChipLogDetail(DataManagement, "Received command without data for cluster " ChipLogFormatMEI, ChipLogValueMEI(clusterId)); } if (CHIP_NO_ERROR == err) { + ChipLogDetail(DataManagement, + "Received command for Endpoint=%" PRIu16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, + endpointId, ChipLogValueMEI(clusterId), ChipLogValueMEI(commandId)); DispatchSingleClusterCommand(ConcreteCommandPath(endpointId, clusterId, commandId), commandDataReader, this); } diff --git a/src/app/CommandSender.cpp b/src/app/CommandSender.cpp index 875ce0a08b868d..e9058f0ce97ec0 100644 --- a/src/app/CommandSender.cpp +++ b/src/app/CommandSender.cpp @@ -153,6 +153,29 @@ CHIP_ERROR CommandSender::ProcessCommandDataElement(CommandDataElement::Parser & hasDataResponse = true; err = aCommandElement.GetData(&commandDataReader); } + + if (err != CHIP_NO_ERROR) + { + ChipLogError(DataManagement, "Received malformed Command Response, err=%" CHIP_ERROR_FORMAT, err.Format()); + } + else + { + if (hasDataResponse) + { + ChipLogProgress(DataManagement, + "Received Command Response Data, Endpoint=%" PRIu16 " Cluster=" ChipLogFormatMEI + " Command=" ChipLogFormatMEI, + endpointId, ChipLogValueMEI(clusterId), ChipLogValueMEI(commandId)); + } + else + { + ChipLogProgress(DataManagement, + "Received Command Response Status for Endpoint=%" PRIu16 " Cluster=" ChipLogFormatMEI + " Command=" ChipLogFormatMEI " Status=0x%" PRIx16, + endpointId, ChipLogValueMEI(clusterId), ChipLogValueMEI(commandId), + to_underlying(statusIB.mStatus)); + } + } SuccessOrExit(err); if (mpCallback != nullptr) diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp index b7b615f33dfce3..ba0db98d3f20e7 100644 --- a/src/app/InteractionModelEngine.cpp +++ b/src/app/InteractionModelEngine.cpp @@ -222,7 +222,7 @@ CHIP_ERROR InteractionModelEngine::OnReadInitialRequest(Messaging::ExchangeConte { CHIP_ERROR err = CHIP_NO_ERROR; - ChipLogDetail(InteractionModel, "Receive %s request", + ChipLogDetail(InteractionModel, "Received %s request", aInteractionType == ReadHandler::InteractionType::Subscribe ? "Subscribe" : "Read"); for (auto & readHandler : mReadHandlers) @@ -271,7 +271,7 @@ CHIP_ERROR InteractionModelEngine::OnWriteRequest(Messaging::ExchangeContext * a { CHIP_ERROR err = CHIP_NO_ERROR; - ChipLogDetail(InteractionModel, "Receive Write request"); + ChipLogDetail(InteractionModel, "Received Write request"); for (auto & writeHandler : mWriteHandlers) { @@ -356,7 +356,7 @@ CHIP_ERROR InteractionModelEngine::OnMessageReceived(Messaging::ExchangeContext void InteractionModelEngine::OnResponseTimeout(Messaging::ExchangeContext * ec) { - ChipLogProgress(InteractionModel, "Time out! failed to receive echo response from Exchange: " ChipLogFormatExchange, + ChipLogProgress(InteractionModel, "Time out! Failed to receive IM response from Exchange: " ChipLogFormatExchange, ChipLogValueExchange(ec)); } @@ -414,7 +414,7 @@ CHIP_ERROR InteractionModelEngine::PushFront(ClusterInfo *& aClusterInfoList, Cl ClusterInfo * last = aClusterInfoList; if (mpNextAvailableClusterInfo == nullptr) { - ChipLogProgress(InteractionModel, "There is no available cluster info in mClusterInfoPool"); + ChipLogError(InteractionModel, "ClusterInfo pool full, cannot handle more entries!"); return CHIP_ERROR_NO_MEMORY; } aClusterInfoList = mpNextAvailableClusterInfo; @@ -465,7 +465,6 @@ bool InteractionModelEngine::IsOverlappedAttributePath(ClusterInfo & aAttributeP } } } - ChipLogDetail(DataManagement, "AttributePath is not interested"); return false; } diff --git a/src/app/tests/integration/chip_im_responder.cpp b/src/app/tests/integration/chip_im_responder.cpp index 0b171750ac06b4..2c4e3d467128cf 100644 --- a/src/app/tests/integration/chip_im_responder.cpp +++ b/src/app/tests/integration/chip_im_responder.cpp @@ -104,10 +104,10 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, chip void DispatchSingleClusterResponseCommand(const ConcreteCommandPath & aCommandPath, chip::TLV::TLVReader & aReader, CommandSender * apCommandObj) { - ChipLogDetail(Controller, - "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); // Nothing todo. + (void) aCommandPath; + (void) aReader; + (void) apCommandObj; } CHIP_ERROR ReadSingleClusterData(const ConcreteAttributePath & aPath, TLV::TLVWriter * apWriter, bool * apDataExists) diff --git a/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt b/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt index c4790fa9d4144b..1b0f52ce202752 100644 --- a/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt +++ b/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt @@ -96,8 +96,6 @@ void Dispatch{{asUpperCamelCase side}}Command({{#if (isServer side)}}CommandHand void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); switch (aCommandPath.mClusterId) @@ -123,8 +121,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: void DispatchSingleClusterResponseCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandSender * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); TLV::TLVType dataTlvType; diff --git a/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp index 52c6b5dd3767df..3832a28e8b70a6 100644 --- a/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp @@ -1839,9 +1839,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); switch (aCommandPath.mClusterId) @@ -1930,9 +1927,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: void DispatchSingleClusterResponseCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandSender * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); TLV::TLVType dataTlvType; diff --git a/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp index ffbbbfc7d13015..b8fcb88a73d458 100644 --- a/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/bridge-app/zap-generated/IMClusterCommandHandler.cpp @@ -596,9 +596,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); switch (aCommandPath.mClusterId) @@ -636,9 +633,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: void DispatchSingleClusterResponseCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandSender * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); TLV::TLVType dataTlvType; diff --git a/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp index b33ccd44301d6f..05060e50ebaf99 100644 --- a/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp @@ -5239,9 +5239,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); switch (aCommandPath.mClusterId) @@ -5258,9 +5255,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: void DispatchSingleClusterResponseCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandSender * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); TLV::TLVType dataTlvType; diff --git a/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp index 0721f6a17ef5cf..a9ce61037e183a 100644 --- a/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp @@ -954,9 +954,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); switch (aCommandPath.mClusterId) @@ -1009,9 +1006,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: void DispatchSingleClusterResponseCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandSender * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); TLV::TLVType dataTlvType; diff --git a/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp index bf403305162375..e07cb335cc771e 100644 --- a/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp @@ -494,9 +494,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); switch (aCommandPath.mClusterId) @@ -531,9 +528,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: void DispatchSingleClusterResponseCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandSender * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); TLV::TLVType dataTlvType; diff --git a/zzz_generated/ota-provider-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/ota-provider-app/zap-generated/IMClusterCommandHandler.cpp index 2746417ea2d30a..a4517146947837 100644 --- a/zzz_generated/ota-provider-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/ota-provider-app/zap-generated/IMClusterCommandHandler.cpp @@ -378,9 +378,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); switch (aCommandPath.mClusterId) @@ -409,9 +406,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: void DispatchSingleClusterResponseCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandSender * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); TLV::TLVType dataTlvType; diff --git a/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp index 0c86de32156f51..91e928b3582e2c 100644 --- a/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp @@ -533,9 +533,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); switch (aCommandPath.mClusterId) @@ -561,9 +558,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: void DispatchSingleClusterResponseCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandSender * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); TLV::TLVType dataTlvType; diff --git a/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp index a8e5fd7e83f32a..73c5dc774d64ef 100644 --- a/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp @@ -595,9 +595,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); switch (aCommandPath.mClusterId) @@ -638,9 +635,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: void DispatchSingleClusterResponseCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandSender * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); TLV::TLVType dataTlvType; diff --git a/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp index 819e5db7866ffb..3c090783bd5702 100644 --- a/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp @@ -446,9 +446,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); switch (aCommandPath.mClusterId) @@ -483,9 +480,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: void DispatchSingleClusterResponseCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandSender * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); TLV::TLVType dataTlvType; diff --git a/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp index a662c5508a3e7f..8dd429aa029eee 100644 --- a/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/temperature-measurement-app/zap-generated/IMClusterCommandHandler.cpp @@ -419,9 +419,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); switch (aCommandPath.mClusterId) @@ -453,9 +450,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: void DispatchSingleClusterResponseCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandSender * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); TLV::TLVType dataTlvType; diff --git a/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp index 54e173fd9567e3..c1facb7d6e03e1 100644 --- a/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp @@ -1579,9 +1579,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); switch (aCommandPath.mClusterId) @@ -1658,9 +1655,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: void DispatchSingleClusterResponseCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandSender * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); TLV::TLVType dataTlvType; diff --git a/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp index 212f0a5357f2c5..07ca94101db7b0 100644 --- a/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp @@ -2393,9 +2393,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); switch (aCommandPath.mClusterId) @@ -2475,9 +2472,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: void DispatchSingleClusterResponseCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandSender * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); TLV::TLVType dataTlvType; diff --git a/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp index 812c5742c9bc72..9b33cc38890aa1 100644 --- a/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp @@ -1474,9 +1474,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); switch (aCommandPath.mClusterId) @@ -1547,9 +1544,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: void DispatchSingleClusterResponseCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandSender * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); TLV::TLVType dataTlvType; diff --git a/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp index be1e6d2a463772..f80703d91709ad 100644 --- a/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp @@ -491,9 +491,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); switch (aCommandPath.mClusterId) @@ -525,9 +522,6 @@ void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV: void DispatchSingleClusterResponseCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandSender * apCommandObj) { - ChipLogDetail(Zcl, "Received Cluster Command: Endpoint=%" PRIx16 " Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI, - aCommandPath.mEndpointId, ChipLogValueMEI(aCommandPath.mClusterId), ChipLogValueMEI(aCommandPath.mCommandId)); - Compatibility::SetupEmberAfObjects(apCommandObj, aCommandPath); TLV::TLVType dataTlvType;