From cce19c935b3a3008be1102655975768ac7dd068f Mon Sep 17 00:00:00 2001 From: Tomas McGuinness Date: Tue, 2 Dec 2025 10:46:44 +0000 Subject: [PATCH 1/2] Fix parameter order in commissioning callbacks --- .../commands/esp_matter_controller_pairing_command.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp_matter_controller/commands/esp_matter_controller_pairing_command.cpp b/components/esp_matter_controller/commands/esp_matter_controller_pairing_command.cpp index be9f02116..95444ede6 100644 --- a/components/esp_matter_controller/commands/esp_matter_controller_pairing_command.cpp +++ b/components/esp_matter_controller/commands/esp_matter_controller_pairing_command.cpp @@ -52,7 +52,7 @@ void pairing_command::OnCommissioningSuccess(chip::PeerId peerId) if (m_callbacks.commissioning_success_callback) { auto fabric = controller_instance.get_commissioner()->GetFabricTable()->FindFabricWithCompressedId( peerId.GetCompressedFabricId()); - m_callbacks.commissioning_success_callback(ScopedNodeId(fabric->GetFabricIndex(), peerId.GetNodeId())); + m_callbacks.commissioning_success_callback(ScopedNodeId(peerId.GetNodeId(), fabric->GetFabricIndex())); } } @@ -68,7 +68,7 @@ void pairing_command::OnCommissioningFailure( auto fabric = controller_instance.get_commissioner()->GetFabricTable()->FindFabricWithCompressedId( peerId.GetCompressedFabricId()); m_callbacks.commissioning_failure_callback( - ScopedNodeId(fabric->GetFabricIndex(), peerId.GetNodeId()), error, stageFailed, + ScopedNodeId(peerId.GetNodeId(), fabric->GetFabricIndex()), error, stageFailed, additionalErrorInfo.HasValue() ? std::make_optional(additionalErrorInfo.Value()) : std::nullopt); } if (m_device_is_icd) { From 0dfd5f6d2cc72b27b2e9c1857b1ffb02d432f347 Mon Sep 17 00:00:00 2001 From: Tomas McGuinness Date: Tue, 2 Dec 2025 16:48:16 +0000 Subject: [PATCH 2/2] Fix typo --- .../commands/esp_matter_controller_pairing_command.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_matter_controller/commands/esp_matter_controller_pairing_command.cpp b/components/esp_matter_controller/commands/esp_matter_controller_pairing_command.cpp index 95444ede6..4143c7423 100644 --- a/components/esp_matter_controller/commands/esp_matter_controller_pairing_command.cpp +++ b/components/esp_matter_controller/commands/esp_matter_controller_pairing_command.cpp @@ -106,7 +106,7 @@ void pairing_command::OnICDStayActiveComplete(ScopedNodeId deviceId, uint32_t pr void pairing_command::OnDiscoveredDevice(const Dnssd::CommissionNodeData &nodeData) { auto &controller_instance = esp_matter::controller::matter_controller_client::get_instance(); - // Ignore nodes with closed comissioning window + // Ignore nodes with closed commissioning window VerifyOrReturn(nodeData.commissioningMode != 0); const uint16_t port = nodeData.port; char buf[Inet::IPAddress::kMaxStringLength];