Skip to content

Commit

Permalink
Allow set up code pairing to continue even if BLE is compiled out (#2…
Browse files Browse the repository at this point in the history
…0325)

Currently chip-tool pairing code 9876 'MT:-24J0YXE00KA0648G00' fails
immediately if BLE is compiled out, due to returning
CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE.

Allow the pairer to continue in this case, so that ethernet pairing can
be used.
  • Loading branch information
mspang authored and pull[bot] committed Jul 19, 2023
1 parent f5ec9ea commit 1224850
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/controller/SetUpCodePairer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ CHIP_ERROR SetUpCodePairer::Connect(SetupPayload & payload)
{
isRunning = true;
}
VerifyOrReturnError(searchOverAll || CHIP_NO_ERROR == err, err);
VerifyOrReturnError(searchOverAll || CHIP_NO_ERROR == err || CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE == err, err);
}

if (searchOverAll || payload.rendezvousInformation == RendezvousInformationFlag::kSoftAP)
Expand All @@ -87,7 +87,7 @@ CHIP_ERROR SetUpCodePairer::Connect(SetupPayload & payload)
{
isRunning = true;
}
VerifyOrReturnError(searchOverAll || CHIP_NO_ERROR == err, err);
VerifyOrReturnError(searchOverAll || CHIP_NO_ERROR == err || CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE == err, err);
}

// We always want to search on network because any node that has already been commissioned will use on-network regardless of the
Expand Down

0 comments on commit 1224850

Please sign in to comment.