samples: boards: st: ble ieee802.15.4 concurrent mode cleaning

Clean sample Bluetooth Heart Rate - 802154 Echo Client
to keep only useful coding

Signed-off-by: Vincent Tardy <[email protected]>

Author: vtardy-st

samples/boards/st/ble_802154/ble_hr_802154_echo_client/CMakeLists.txt

@@ -3,32 +3,10 @@
 cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(sockets_echo_client)
-
-if(CONFIG_NET_SOCKETS_SOCKOPT_TLS AND
-   CONFIG_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED AND
-   (CONFIG_NET_SAMPLE_PSK_HEADER_FILE STREQUAL "dummy_psk.h"))
-  add_custom_target(development_psk
-    COMMAND ${CMAKE_COMMAND} -E echo "----------------------------------------------------------"
-    COMMAND ${CMAKE_COMMAND} -E echo "--- WARNING: Using dummy PSK! Only suitable for        ---"
-    COMMAND ${CMAKE_COMMAND} -E echo "--- development. Set NET_SAMPLE_PSK_HEADER_FILE to use ---"
-    COMMAND ${CMAKE_COMMAND} -E echo "--- own pre-shared key.                                ---"
-    COMMAND ${CMAKE_COMMAND} -E echo "----------------------------------------------------------"
-  )
-  add_dependencies(app development_psk)
-endif()
+project(st_ble_802154_echo_client)
 
 target_sources(                     app PRIVATE src/echo-client.c)
 target_sources(                     app PRIVATE src/app_ble.c)
 target_sources_ifdef(CONFIG_NET_UDP app PRIVATE src/udp.c)
-target_sources_ifdef(CONFIG_NET_TCP app PRIVATE src/tcp.c)
 
 include(${ZEPHYR_BASE}/samples/net/common/common.cmake)
-
-set(gen_dir ${ZEPHYR_BINARY_DIR}/include/generated/)
-
-generate_inc_file_for_target(
-  app
-  src/echo-apps-cert.der
-  ${gen_dir}/echo-apps-cert.der.inc
-)

samples/boards/st/ble_802154/ble_hr_802154_echo_client/Kconfig

@@ -6,52 +6,6 @@
 
 mainmenu "BLE Heart Rate - Networking echo-client sample application"
 
-config NET_SAMPLE_IFACE2_MY_IPV6_ADDR
-	string "My IPv6 address for second interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE2_MY_IPV4_ADDR
-	string "My IPv4 address for second interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE2_VLAN_TAG
-	int "VLAN tag for second interface"
-	default 100
-	range 0 4094
-	depends on NET_VLAN
-	help
-	  Set VLAN (virtual LAN) tag (id) that is used in the sample
-	  application.
-
-config NET_SAMPLE_IFACE3_MY_IPV6_ADDR
-	string "My IPv6 address for third interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE3_MY_IPV4_ADDR
-	string "My IPv4 address for third interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE3_VLAN_TAG
-	int "VLAN tag for third interface"
-	default 200
-	range 0 4094
-	depends on NET_VLAN
-	help
-	  Set VLAN (virtual LAN) tag (id) that is used in the sample
-	  application.
-
-config NET_SAMPLE_PSK_HEADER_FILE
-	string "Header file containing PSK"
-	default "dummy_psk.h"
-	depends on MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
-	help
-	  Name of a header file containing a
-	  pre-shared key.
-
 config NET_SAMPLE_SEND_ITERATIONS
 	int "Send sample data this many times"
 	default 0

samples/boards/st/ble_802154/ble_hr_802154_echo_client/README.rst

@@ -9,38 +9,37 @@
 Overview
 ********
 
-The sample application for Zephyr implements a concurrent mode
-BLE - IEEE 802.15.4.
-The 802.15.4 part implements UDP/TCP client that will send IPv4
-or IPv6 packets, wait for the data to be sent back, and then verify
-it matches the data that was sent.
+The sample application implements a concurrent mode BLE - IEEE 802.15.4.
+Both wireless protocols Bluetooth |reg| Energy and IEEE 802.15.4 coexist :
+the application supports simultaneously one Bluetooth |reg| Energy connection
+and one IEEE 802.15.4 connection.
+The 802.15.4 part implements UDP client that will send IPv6 packets,
+wait for the data to be sent back, and then verify it matches
+the data that was sent.
 The BLE part exposes the HR (Heart Rate) GATT Service. Once a device
 connects it will generate dummy heart-rate values.
 
 The source code for this sample application can be found at:
 :zephyr_file:`samples/boards/st/ble_802154/ble_hr_802154_echo_client`.
 
-Requirements
-************
+The IEEE 802.15.4 config of the sample enables support for native
+IEEE 802.15.4 connectivity.
+Note that by default IEEE 802.15.4 L2 uses unacknowledged communication.
+To improve connection reliability, acknowledgments can be enabled with
+shell command: ``ieee802154 ack set``.
+
+Environment Setup
+*****************
 
 This sample has been tested on the STMicroelectonics NUCLEO-WBA65RI board
 (nucleo_wba65ri).
+This board interacts simultaneously with another board embedding an
+echo-server sample with the 802.15.4 overlay (nucleo_wba65ri) and a
+smartphone supporting BLE Heart Rate.
 
 Building and Running
 ********************
 
-There are configuration files for different boards and setups in the
-samples directory:
-
-- :file:`prj.conf`
-  Generic config file, normally you should use this.
-
-- :file:`overlay-802154.conf`
-  This overlay config enables support for native IEEE 802.15.4 connectivity.
-  Note that by default IEEE 802.15.4 L2 uses unacknowledged communication.
-  To improve connection reliability, acknowledgments can be enabled with shell
-  command: ``ieee802154 ack set``.
-
 Build sample application like this:
 
 .. zephyr-app-commands::
@@ -55,18 +54,17 @@ Example building for the IEEE 802.15.4 on nucleo_wba65ri:
 .. zephyr-app-commands::
    :zephyr-app: samples/boards/st/ble_802154/ble_hr_802154_echo_client
    :board: nucleo_wba65ri
-   :gen-args: -DEXTRA_CONF_FILE=overlay-802154.conf
    :goals: build
    :compact:
 
 The LED 1 toggles while application is BLE advertising. Once a remote device
 connects, the LED 1 turns ON and application will generate dummy heart-rate values.
-Once remote device disconnects, the ammplication restarts BLE advertising and LED 1
+Once remote device disconnects, the application restarts BLE advertising and LED 1
 toggles.
 
 Simultaneously, IEEE 802.15.4 feature is enabled.
 In remote device, you can run a echo-server sample application with
 :file:`overlay-802154.conf`.
-Once both devices are connected, local device will send IPv4 or IPv6 packets,
-wait for the data to be sent back from the remote echo-server device, and then
-verify it matches the data that was sent.
+Once both devices are connected, local device will send IPv6 packets,wait for
+the data to be sent back from the remote echo-server device, and then verify it
+matches the data that was sent.

samples/boards/st/ble_802154/ble_hr_802154_echo_client/overlay-802154.conf

@@ -1,9 +1,9 @@
 # Generic networking options
 CONFIG_NETWORKING=y
 CONFIG_NET_UDP=y
-CONFIG_NET_TCP=y
+CONFIG_NET_TCP=n
 CONFIG_NET_IPV6=y
-CONFIG_NET_IPV4=y
+CONFIG_NET_IPV4=n
 CONFIG_NET_SOCKETS=y
 CONFIG_ZVFS_POLL_MAX=5
 CONFIG_NET_CONNECTION_MANAGER=y
@@ -40,17 +40,25 @@ CONFIG_NET_IF_MAX_IPV4_COUNT=3
 # Network shell
 CONFIG_NET_SHELL=y
 
-# The addresses are selected so that qemu<->qemu connectivity works ok.
-# For linux<->qemu connectivity, create a new conf file and swap the
-# addresses (so that peer address is ending to 2).
+# Network Config
 CONFIG_NET_CONFIG_SETTINGS=y
 CONFIG_NET_CONFIG_NEED_IPV6=y
 CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::2"
 CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::1"
-CONFIG_NET_CONFIG_NEED_IPV4=y
-CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.2"
-CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.1"
+CONFIG_NET_CONFIG_NEED_IPV4=n
+CONFIG_NET_CONFIG_MY_IPV4_ADDR=""
+CONFIG_NET_CONFIG_PEER_IPV4_ADDR=""
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
+CONFIG_NET_RX_STACK_SIZE=2048
+
+CONFIG_NET_L2_IEEE802154=y
+CONFIG_NET_L2_IEEE802154_SHELL=y
+CONFIG_NET_L2_IEEE802154_LOG_LEVEL_INF=y
+
+CONFIG_NET_CONFIG_IEEE802154_CHANNEL=26
+
+CONFIG_NET_L2_IEEE802154_FRAGMENT_REASS_CACHE_SIZE=5
+
 
 # Bluetootn configuration
 CONFIG_BT=y

samples/boards/st/ble_802154/ble_hr_802154_echo_client/prj.conf

@@ -130,7 +130,6 @@ static void hrs_notify(void)
 	}
 }
 
-#if defined(CONFIG_GPIO)
 /* The devicetree node identifier for the "led0" alias. */
 #define LED0_NODE DT_ALIAS(led0)
 
@@ -195,7 +194,6 @@ static void blink_stop(void)
 	gpio_pin_set(led.port, led.pin, (int)led_is_on);
 }
 #endif /* LED0_NODE */
-#endif /* CONFIG_GPIO */
 
 int ble_init(void)
 {

samples/boards/st/ble_802154/ble_hr_802154_echo_client/src/app_ble.c

@@ -90,15 +90,24 @@ int start_udp(void);
 int process_udp(void);
 void stop_udp(void);
 #else
-static inline void init_udp(void) { }
-static inline int start_udp(void) { return 0; }
-static inline int process_udp(void) { return 0; }
-static inline void stop_udp(void) { }
+static inline void init_udp(void)
+{
+	/*nothing to do*/
+}
+static inline int start_udp(void)
+{
+	return 0;
+}
+static inl
+{
+	return 0;
+}
+static inline void stop_udp(void)
+{
+	/*nothing to do*/
+}
 #endif /* defined(CONFIG_NET_UDP) */
 
-int start_tcp(void);
-int process_tcp(void);
-void stop_tcp(void);
 
 #if defined(CONFIG_BT)
 extern int ble_init(void);