Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nrfconnect] Change BLE and logging configuration #3301

Merged
merged 1 commit into from
Oct 26, 2020
Merged

[nrfconnect] Change BLE and logging configuration #3301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions config/nrfconnect/overlay-sample-defaults.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ CONFIG_BT_PERIPHERAL=y
CONFIG_BT_DEVICE_APPEARANCE=0
CONFIG_BT_DEVICE_NAME_DYNAMIC=y
CONFIG_BT_DEVICE_NAME_MAX=15
CONFIG_BT_MAX_CONN=2
CONFIG_BT_MAX_CONN=1

# L2 OpenThread enabling
CONFIG_NET_L2_OPENTHREAD=y
Expand All @@ -66,7 +66,6 @@ CONFIG_OPENTHREAD_SNTP_CLIENT=y
CONFIG_OPENTHREAD_DNS_CLIENT=y
CONFIG_OPENTHREAD_MTD_NETDIAG=y
CONFIG_OPENTHREAD_ENABLE_SERVICE=y
CONFIG_OPENTHREAD_JOINER=y
CONFIG_OPENTHREAD_MANUAL_START=y
CONFIG_OPENTHREAD_THREAD_STACK_SIZE=6144

Expand Down
5 changes: 2 additions & 3 deletions examples/lighting-app/nrfconnect/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ CONFIG_OPENTHREAD_CHANNEL=15
CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread"
CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22"

# Long log strings
CONFIG_LOG_STRDUP_MAX_STRING=256
CONFIG_LOG_STRDUP_BUF_COUNT=20
# Bluetooth overrides
CONFIG_BT_DEVICE_NAME="ChipLight"

# Additional configs for debbugging experience.
CONFIG_THREAD_NAME=y
Expand Down
5 changes: 2 additions & 3 deletions examples/lock-app/nrfconnect/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ CONFIG_OPENTHREAD_CHANNEL=15
CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread"
CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22"

# Long log strings
CONFIG_LOG_STRDUP_MAX_STRING=256
CONFIG_LOG_STRDUP_BUF_COUNT=20
# Bluetooth overrides
CONFIG_BT_DEVICE_NAME="ChipLock"

# Additional configs for debbugging experience.
CONFIG_THREAD_NAME=y
Expand Down
2 changes: 1 addition & 1 deletion examples/platform/nrfconnect/app/Service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include <platform/nrfconnect/ThreadStackManagerImpl.h>
#endif

LOG_MODULE_DECLARE(serv);
LOG_MODULE_DECLARE(app);

// Transport Callbacks
namespace {
Expand Down
2 changes: 1 addition & 1 deletion src/platform/Zephyr/GenericBLEManagerImpl_Zephyr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <sys/byteorder.h>
#include <sys/util.h>

LOG_MODULE_DECLARE(chip, LOG_LEVEL_DBG);
LOG_MODULE_DECLARE(chip);

using namespace ::chip;
using namespace ::chip::Ble;
Expand Down