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.

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

Add support for RTT cli #628

Merged
merged 6 commits into from
Oct 21, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
14 changes: 13 additions & 1 deletion script/build
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ OT_CMAKE_NINJA_TARGET=${OT_CMAKE_NINJA_TARGET:-}
NRF_PLATFORMS=(nrf52811 nrf52833 nrf52840)
readonly NRF_PLATFORMS

NRF_BUILD_TYPES=(UART_trans USB_trans SPI_trans_NCP soft_crypto soft_crypto_threading)
NRF_BUILD_TYPES=(UART_trans USB_trans SPI_trans_NCP RTT_trans soft_crypto soft_crypto_threading)
readonly NRF_BUILD_TYPES

OT_SRCDIR="$(pwd)"
Expand Down Expand Up @@ -107,6 +107,10 @@ main()
OT_CMAKE_NINJA_TARGET=("ot-ncp-mtd" "ot-rcp")
options+=("${local_options[@]}" "-DOT_NCP_SPI=ON")
;;
RTT_trans)
OT_CMAKE_NINJA_TARGET=("ot-cli-mtd" "ot-rcp")
options+=("${local_options[@]}" "-DOT_RTT_UART=ON")
;;
esac
;;
nrf52833)
Expand All @@ -122,6 +126,10 @@ main()
OT_CMAKE_NINJA_TARGET=("ot-ncp-ftd" "ot-ncp-mtd" "ot-rcp")
options+=("${local_options[@]}" "-DOT_NCP_SPI=ON")
;;
RTT_trans)
OT_CMAKE_NINJA_TARGET=("ot-cli-ftd" "ot-cli-mtd" "ot-rcp")
options+=("${local_options[@]}" "-DOT_RTT_UART=ON")
;;
esac
;;
nrf52840)
Expand All @@ -137,6 +145,10 @@ main()
OT_CMAKE_NINJA_TARGET=("ot-ncp-ftd" "ot-ncp-mtd" "ot-rcp")
options+=("${local_options[@]}" "-DOT_NCP_SPI=ON" "-DOT_EXTERNAL_MBEDTLS=nordicsemi-mbedtls")
;;
RTT_trans)
OT_CMAKE_NINJA_TARGET=("ot-cli-ftd" "ot-cli-mtd" "ot-rcp")
options+=("${local_options[@]}" "-DOT_RTT_UART=ON" "-DOT_EXTERNAL_MBEDTLS=nordicsemi-mbedtls")
;;
soft_crypto)
options+=("${local_options[@]}")
;;
Expand Down
9 changes: 9 additions & 0 deletions script/test
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,15 @@ main()
rm -rf "$OT_BUILDDIR"
"$(dirname "$0")"/build nrf52840 SPI_trans_NCP "${OT_OPTIONS[@]}"

rm -rf "$OT_BUILDDIR"
"$(dirname "$0")"/build nrf52811 RTT_trans "${OT_OPTIONS[@]}"

rm -rf "$OT_BUILDDIR"
"$(dirname "$0")"/build nrf52833 RTT_trans "${OT_OPTIONS[@]}"

rm -rf "$OT_BUILDDIR"
"$(dirname "$0")"/build nrf52840 RTT_trans "${OT_OPTIONS[@]}"

rm -rf "$OT_BUILDDIR"
"$(dirname "$0")"/build nrf52840 soft_crypto "${OT_OPTIONS[@]}"

Expand Down
4 changes: 3 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
# POSSIBILITY OF SUCH DAMAGE.
#

if(OT_NCP_SPI)
if(OT_RTT_UART)
list(APPEND OT_PLATFORM_DEFINES "OPENTHREAD_UART_RTT_ENABLE=1")
elseif(OT_NCP_SPI)
list(APPEND OT_PLATFORM_DEFINES "SPIS_AS_SERIAL_TRANSPORT=1")
else()
option(OT_USB "enable nrf USB as serial transport support")
Expand Down
5 changes: 5 additions & 0 deletions src/src/system.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@

#include <openthread/config.h>

#include <utils/uart_rtt.h>
jwhui marked this conversation as resolved.
Show resolved Hide resolved

#if !OPENTHREAD_CONFIG_ENABLE_BUILTIN_MBEDTLS_MANAGEMENT && PLATFORM_OPENTHREAD_VANILLA

#include <mbedtls/platform.h>
Expand Down Expand Up @@ -139,6 +141,9 @@ bool otSysPseudoResetWasRequested(void)

void otSysProcessDrivers(otInstance *aInstance)
{
#if OPENTHREAD_UART_RTT_ENABLE
utilsUartRttProcess();
#endif
jwhui marked this conversation as resolved.
Show resolved Hide resolved
nrf5RadioProcess(aInstance);
nrf5TransportProcess();
nrf5TempProcess();
Expand Down