Skip to content

Commit

Permalink
Rename WoBLE to CHIPoBLE in nRF5 platform code
Browse files Browse the repository at this point in the history
  • Loading branch information
pan-apple committed Mar 26, 2020
1 parent 905b97e commit 2051ff5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/platform/nRF5/ConnectivityManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <support/logging/CHIPLogging.h>
#include <support/CodeUtils.h>

#if CHIP_DEVICE_CONFIG_ENABLE_WOBLE
#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
#include <platform/internal/GenericConnectivityManagerImpl_BLE.ipp>
#endif

Expand Down
12 changes: 6 additions & 6 deletions src/platform/nRF5/ThreadStackManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,17 @@ bool ThreadStackManagerImpl::IsInitialized()
return sInstance.mThreadStackLock != NULL;
}

void ThreadStackManagerImpl::_OnWoBLEAdvertisingStart(void)
void ThreadStackManagerImpl::_OnCHIPoBLEAdvertisingStart(void)
{
// If Thread-over-BLE is enabled, ensure that ToBLE advertising is stopped before
// starting WoBLE advertising. This is accomplished by disabling the OpenThread
// starting CHIPoBLE advertising. This is accomplished by disabling the OpenThread
// IPv6 interface via a call to otIp6SetEnabled(false).
//
// On platforms where there is no native support for simultaneous BLE advertising
// (e.g. Nordic’s SoftDevice), it is necessary to coordinate between the different
// advertising modes a CHIP device may employ. This arises in particular when a
// device supports both WoBLE and ToBLE, each of which requires a separate advertising
// regime. The OnWoBLEAdvertisingStart()/OnWoBLEAdvertisingStop() methods handle
// device supports both CHIPoBLE and ToBLE, each of which requires a separate advertising
// regime. The OnCHIPoBLEAdvertisingStart()/OnCHIPoBLEAdvertisingStop() methods handle
// the switching between the two modes.
//
#if OPENTHREAD_CONFIG_ENABLE_TOBLE
Expand All @@ -84,10 +84,10 @@ void ThreadStackManagerImpl::_OnWoBLEAdvertisingStart(void)
#endif
}

void ThreadStackManagerImpl::_OnWoBLEAdvertisingStop(void)
void ThreadStackManagerImpl::_OnCHIPoBLEAdvertisingStop(void)
{
// If Thread-over-BLE is enabled, and a Thread provision exists, ensure that ToBLE
// advertising is re-activated once WoBLE advertising stops.
// advertising is re-activated once CHIPoBLE advertising stops.
//
#if OPENTHREAD_CONFIG_ENABLE_TOBLE
LockThreadStack();
Expand Down

0 comments on commit 2051ff5

Please sign in to comment.