Skip to content

net: openthread: pull fixes for logging and enabling BLE in OpenThread #2456

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

Merged
merged 2 commits into from
Jan 31, 2025
Merged

net: openthread: pull fixes for logging and enabling BLE in OpenThread #2456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef646ce
[nrf fromtree] openthread: fix logging configuration
maciejbaczmanski Jan 24, 2025
789fc35
[nrf fromtree] net: openthread: fix `otPlatBleEnable`
maciejbaczmanski Jan 27, 2025
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
2 changes: 1 addition & 1 deletion modules/openthread/platform/alarm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*/

#define LOG_MODULE_NAME net_openthread_alarm
#define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL

Check notice on line 9 in modules/openthread/platform/alarm.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

modules/openthread/platform/alarm.c:9 
-#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
+#define LOG_LEVEL       CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL

Check notice on line 9 in modules/openthread/platform/alarm.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

modules/openthread/platform/alarm.c:9 
-#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
+#define LOG_LEVEL       CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(LOG_MODULE_NAME);

Expand Down
4 changes: 2 additions & 2 deletions modules/openthread/platform/ble.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
/* Zephyr Logging */

#define LOG_MODULE_NAME net_openthread_tcat
#define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL

LOG_MODULE_REGISTER(LOG_MODULE_NAME);

Expand Down Expand Up @@ -476,7 +476,7 @@ otError otPlatBleEnable(otInstance *aInstance)
LOG_WRN("BLE enable failed with error code %d", err);
return OT_ERROR_FAILED;
} else if (err == -EALREADY) {
err = k_sem_take(&ot_plat_ble_init_semaphore, K_MSEC(500));
bt_conn_cb_register(&conn_callbacks);
return OT_ERROR_NONE;
}

Expand Down
2 changes: 1 addition & 1 deletion modules/openthread/platform/messagepool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <openthread/platform/messagepool.h>

#define LOG_MODULE_NAME net_otPlat_messagepool
#define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL

LOG_MODULE_REGISTER(LOG_MODULE_NAME);

Expand Down
2 changes: 1 addition & 1 deletion modules/openthread/platform/uart.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/

#define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
#define LOG_MODULE_NAME net_otPlat_uart

Check notice on line 8 in modules/openthread/platform/uart.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

modules/openthread/platform/uart.c:8 
-#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
+#define LOG_LEVEL       CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL

Check notice on line 8 in modules/openthread/platform/uart.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

modules/openthread/platform/uart.c:8 
-#define LOG_LEVEL CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL
+#define LOG_LEVEL       CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL

#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(LOG_MODULE_NAME);
Expand Down
12 changes: 12 additions & 0 deletions subsys/net/l2/openthread/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,18 @@ config OPENTHREAD_LOG_LEVEL
default 4 if OPENTHREAD_LOG_LEVEL_INFO
default 5 if OPENTHREAD_LOG_LEVEL_DEBG
default 0
help
Log level for OpenThread stack.

config OPENTHREAD_PLATFORM_LOG_LEVEL
int
default 1 if OPENTHREAD_LOG_LEVEL_CRIT
default 2 if OPENTHREAD_LOG_LEVEL_WARN
default 3 if OPENTHREAD_LOG_LEVEL_NOTE || OPENTHREAD_LOG_LEVEL_INFO
default 4 if OPENTHREAD_LOG_LEVEL_DEBG
default 0
help
Log level for OpenThread Zephyr platform.

menuconfig OPENTHREAD_L2_DEBUG
bool "OpenThread L2 log support"
Expand Down
Loading