espressif/esp-matter
1
0
Fork 0
mirror of https://github.com/espressif/esp-matter.git synced 2026-04-27 19:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pr_1600' into 'main'

Browse Source 
[GH_PR] Fix parameter order in commissioning callbacks (CON-1874)

See merge request app-frameworks/esp-matter!1329
This commit is contained in:
Hrishikesh Dhayagude
2025-12-03 14:48:14 +08:00
parent 8d399a1927 0dfd5f6d2c
commit 57592964ff
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter_controller/commands/esp_matter_controller_pairing_command.cpp
+3 -3
View File
@@ -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) {
@@ -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];