diff --git a/main/include/OpenThreadConfig.h b/main/include/OpenThreadConfig.h index f97df908..643f01ed 100644 --- a/main/include/OpenThreadConfig.h +++ b/main/include/OpenThreadConfig.h @@ -33,7 +33,7 @@ #define OPENTHREAD_CONFIG_LOG_OUTPUT OPENTHREAD_CONFIG_LOG_OUTPUT_APP // Turn on a moderate level of logging in OpenThread -#define OPENTHREAD_CONFIG_LOG_LEVEL OT_LOG_LEVEL_DEBG +#define OPENTHREAD_CONFIG_LOG_LEVEL OT_LOG_LEVEL_NOTE // Turn on Nordic platform logs #define OPENTHREAD_CONFIG_LOG_PLATFORM 1 @@ -49,7 +49,11 @@ // ============================================================== // CONFIG TOBLE // ============================================================== -#define OPENTHREAD_CONFIG_ENABLE_TOBLE 1 + +/** + * To enable the Thread-over-BLE feature set this to 1. + */ +#define OPENTHREAD_CONFIG_ENABLE_TOBLE 0 #define OPENTHREAD_CONFIG_ENABLE_BLE 1 #define OPENTHREAD_CONFIG_ENABLE_TOBLE_TO_BLE 1 diff --git a/main/main.cpp b/main/main.cpp index 5d341151..bda73dfc 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -298,6 +298,7 @@ int main(void) } } +#if OPENTHREAD_CONFIG_ENABLE_TOBLE // Disable Weave Pairing if Thread network has already been provisioned. // TODO: Change this to only disable WoBLE when *full provisioning* has completed, // i.e. ConfigurationManager.IsPairedToAccount() @@ -307,6 +308,7 @@ int main(void) NRF_LOG_INFO("WoBLE pairing is disabled, as Thread is provisioned"); } else +#endif // OPENTHREAD_CONFIG_ENABLE_TOBLE { NRF_LOG_INFO("WoBLE pairing is enabled"); } diff --git a/third_party/openthread b/third_party/openthread index ee324892..2279ef61 160000 --- a/third_party/openthread +++ b/third_party/openthread @@ -1 +1 @@ -Subproject commit ee32489254f4aeed52886994fefbbb0a5bc174e3 +Subproject commit 2279ef610eef80597bd789611d6931b95e08bf48 diff --git a/third_party/openweave-core b/third_party/openweave-core index 05ffe019..914546c8 160000 --- a/third_party/openweave-core +++ b/third_party/openweave-core @@ -1 +1 @@ -Subproject commit 05ffe0199222812ae4bcfbd15a4df6805ce3ee2d +Subproject commit 914546c8aaa9e7f0a6e6d1776ff9872f0b7c75b6