samples: dect_phy: dect_shell: mac: rach_tx: interval support

Added a an option to send data in intervals: --interval <secs>
Additionally, in addition to given data, to include also
modem temperature to data in json format: --get_mdm_temp

Signed-off-by: Jani Hirsimäki <[email protected]>

Author: jhirsi

samples/dect/dect_phy/dect_shell/README.rst

@@ -639,6 +639,8 @@ Example: starting of cluster beacon and sending RA data to it
 
   .. code-block:: console
 
+      desh:~$ dect sett --reset
+      desh:~$ dect sett -t 1245
       desh:~$ dect mac beacon_scan -c 1659
       -----------------------------------------------------------------------------
       Beacon scan started.
@@ -824,6 +826,18 @@ Example: starting of cluster beacon and sending RA data to it
             Payload length: 0
             Received padding data, len 0, payload is not printed
 
+* PT/client side - Send JSON-formatted periodic RA data in 10-second intervals with the current modem temperature to the scanned beacon:
+
+  .. code-block:: console
+
+      desh:~$ dect mac rach_tx -t 1234 -d "Data from device 1245" -i 10 -j
+
+* PT/client side - Stop periodic RA data sending:
+
+  .. code-block:: console
+
+      desh:~$ dect mac rach_tx stop
+
 * PT/client side - Send association release to the scanned beacon:
 
   .. code-block:: console

samples/dect/dect_phy/dect_shell/src/dect/common/dect_app_time.c

@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "nrf_modem_dect_phy.h"
+#include <nrf_modem_dect_phy.h>
 
 #include "dect_app_time.h"
 

samples/dect/dect_phy/dect_shell/src/dect/common/dect_common.h

@@ -10,7 +10,7 @@
 #include <zephyr/kernel.h>
 #include <modem/nrf_modem_lib.h>
 #include <nrf_modem_at.h>
-#include "nrf_modem_dect_phy.h"
+#include <nrf_modem_dect_phy.h>
 
 #define DECT_MAX_TBS	  5600
 #define DECT_DATA_MAX_LEN (DECT_MAX_TBS / 8)

samples/dect/dect_phy/dect_shell/src/dect/common/dect_common_pdu.c

@@ -9,8 +9,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <zephyr/shell/shell.h>
+#include <nrf_modem_dect_phy.h>
+
 #include "desh_print.h"
-#include "nrf_modem_dect_phy.h"
 
 #include "dect_common.h"
 #include "dect_common_utils.h"

samples/dect/dect_phy/dect_shell/src/dect/common/dect_common_settings.c

@@ -12,9 +12,9 @@
 #include <zephyr/shell/shell.h>
 #include <zephyr/settings/settings.h>
 #include <zephyr/random/random.h>
+#include <nrf_modem_dect_phy.h>
 
 #include "desh_print.h"
-#include "nrf_modem_dect_phy.h"
 #include "dect_common.h"
 #include "dect_common_settings.h"
 

samples/dect/dect_phy/dect_shell/src/dect/common/dect_phy_common.h

@@ -10,7 +10,7 @@
 #include <zephyr/kernel.h>
 #include <modem/nrf_modem_lib.h>
 #include <nrf_modem_at.h>
-#include "nrf_modem_dect_phy.h"
+#include <nrf_modem_dect_phy.h>
 #include "dect_common.h"
 
 /******************************************************************************/

samples/dect/dect_phy/dect_shell/src/dect/common/dect_phy_common_rx.c

@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "nrf_modem_dect_phy.h"
+#include <nrf_modem_dect_phy.h>
 
 static uint16_t last_rx_op_channel;
 

samples/dect/dect_phy/dect_shell/src/dect/common/dect_phy_common_rx.h

@@ -7,7 +7,7 @@
 #ifndef DECT_PHY_COMMON_RX_H
 #define DECT_PHY_COMMON_RX_H
 
-#include "nrf_modem_dect_phy.h"
+#include <nrf_modem_dect_phy.h>
 
 /* Due to lack of information of a carrier/channel in pdc_cb from libmodem/modem,
  * a small wrapper for RX operations is needed to have a glue to which channel pdc_cb is for.

samples/dect/dect_phy/dect_shell/src/dect/dect_phy_ctrl.c

@@ -15,9 +15,9 @@
 
 #include <modem/nrf_modem_lib.h>
 #include <nrf_modem_at.h>
+#include <nrf_modem_dect_phy.h>
 
 #include "desh_print.h"
-#include "nrf_modem_dect_phy.h"
 
 #include "dect_common_utils.h"
 #include "dect_common_settings.h"
@@ -69,6 +69,8 @@ static struct dect_phy_ctrl_data {
 	uint8_t last_received_pcc_short_nw_id;
 	uint16_t last_received_pcc_transmitter_short_rd_id;
 
+	int16_t last_valid_temperature;
+
 	uint8_t last_received_pcc_phy_len;
 	enum dect_phy_packet_length_type last_received_pcc_phy_len_type;
 
@@ -197,6 +199,10 @@ static void dect_phy_ctrl_msgq_thread_handler(void)
 			struct dect_phy_common_op_initialized_params *params =
 				(struct dect_phy_common_op_initialized_params *)event.data;
 
+			if (params->temperature != NRF_MODEM_DECT_PHY_TEMP_NOT_MEASURED) {
+				ctrl_data.last_valid_temperature = params->temperature;
+			}
+
 			if (params->status) {
 				desh_error("(%s): init failed (time %llu, temperature %d, "
 					   "temp_limit %d): %d",
@@ -352,6 +358,10 @@ static void dect_phy_ctrl_msgq_thread_handler(void)
 			struct dect_phy_common_op_completed_params *params =
 				(struct dect_phy_common_op_completed_params *)event.data;
 
+			if (params->temperature != NRF_MODEM_DECT_PHY_TEMP_NOT_MEASURED) {
+				ctrl_data.last_valid_temperature = params->temperature;
+			}
+
 			if (params->status != NRF_MODEM_DECT_PHY_SUCCESS) {
 				char tmp_str[128] = {0};
 
@@ -768,6 +778,11 @@ int dect_phy_ctrl_time_query(void)
 	return nrf_modem_dect_phy_time_get();
 }
 
+int dect_phy_ctrl_modem_temperature_get(void)
+{
+	return ctrl_data.last_valid_temperature;
+}
+
 /**************************************************************************************************/
 
 void dect_phy_ctrl_rx_stop(void)
@@ -861,9 +876,9 @@ int dect_phy_ctrl_rx_start(struct dect_phy_rx_cmd_params *params, bool restart)
 void dect_phy_ctrl_status_get_n_print(void)
 {
 	char tmp_mdm_str[128] = {0};
-	int temperature;
 	int ret;
 	struct dect_phy_settings *current_settings = dect_common_settings_ref_get();
+	int temperature = dect_phy_ctrl_modem_temperature_get();
 
 	desh_print("desh-dect-phy status:");
 	ret = nrf_modem_at_scanf("AT+CGMR", "%s", tmp_mdm_str);
@@ -880,8 +895,7 @@ void dect_phy_ctrl_status_get_n_print(void)
 	}
 	desh_print("  HW version:        %s", tmp_mdm_str);
 
-	ret = nrf_modem_at_scanf("AT%XTEMP?", "%%XTEMP: %d", &temperature);
-	if (ret <= 0) {
+	if (temperature == NRF_MODEM_DECT_PHY_TEMP_NOT_MEASURED) {
 		sprintf(tmp_mdm_str, "%s", "not known");
 	} else {
 		sprintf(tmp_mdm_str, "%d", temperature);
@@ -1332,6 +1346,7 @@ NRF_MODEM_LIB_ON_INIT(dect_phy_ctrl_init_hook, dect_phy_ctrl_on_modem_lib_init,
 static int dect_phy_ctrl_init(void)
 {
 	memset(&ctrl_data, 0, sizeof(struct dect_phy_ctrl_data));
+	ctrl_data.last_valid_temperature = NRF_MODEM_DECT_PHY_TEMP_NOT_MEASURED;
 
 	ctrl_data.debug = true; /* Debugs enabled as a default */
 	k_work_queue_start(&dect_phy_ctrl_work_q, dect_phy_ctrl_th_stack,

samples/dect/dect_phy/dect_shell/src/dect/dect_phy_ctrl.h

@@ -49,6 +49,8 @@ void dect_phy_ctrl_rx_stop(void);
 
 int dect_phy_ctrl_time_query(void);
 
+int dect_phy_ctrl_modem_temperature_get(void);
+
 /******************************************************************************/
 
 typedef void (*dect_phy_ctrl_rssi_scan_completed_callback_t)(