Merge pull request #134 from tmobile/tmo-CFSPDK-1107-Implement-Callback-Mechanism-for-SMS-Messages

Added async SMS function to tmo shell

Author: johnlange2

samples/tmo_shell/Kconfig

@@ -16,6 +16,11 @@ config TMO_SHELL_USE_MBED
     bool "Configure HTTP to use mbedTLS for TLS connections"
     default n
 
+config TMO_SHELL_ASYNC_SMS
+    bool "Use asynchronous callback for SMS"
+    select MODEM_SMS_CALLBACK
+    default n
+
 config TMO_SHELL_BUILD_EK
     bool "Build in ekermit"
     select USE_SEGGER_RTT

samples/tmo_shell/src/tmo_ble_demo.c

@@ -572,8 +572,8 @@ void button_stat_change(const struct device *dev, struct gpio_callback *cb,
 	k_sem_give(&update_sem);
 	k_sem_give(&ble_thd_sem);
 }
+
 #if CONFIG_MODEM
-#include "modem_sms.h"
 
 static uint64_t get_imei()
 {
@@ -626,8 +626,6 @@ static ssize_t cell_rssi_rd_cb(struct bt_conn *conn,
 #define UUID_TMO_CELL_SVC \
 	uuid128(0x2618484c, 0x7465, 0x441d, 0xbc3f, 0x35f1af1c6f16)
 
-// Cell tower characteristic: 55f78d7f-6f97-4444-9b77-00dcc9d5a07c
-
 // Cell strength characteristic: 0e3b403a4-e97d-4401-8d09-87b6af705298 int8t
 #define UUID_TMO_CELL_RSSI \
 	uuid128(0x0e3b403a4, 0xe97d, 0x4401, 0x8d09, 0x87b6af705298)

samples/tmo_shell/src/tmo_modem.c

@@ -227,3 +227,38 @@ int tmo_modem_get_imsi(char* res, int res_len) {
 int tmo_modem_get_msisdn(char* res, int res_len) {
 	return tmo_modem_atcmd_str_get(res, res_len, msisdn_e);
 }
+
+#if CONFIG_MODEM_SMS && CONFIG_TMO_SHELL_ASYNC_SMS
+#include <zephyr/drivers/modem/sms.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/shell/shell_uart.h>
+
+static void on_sms_recv(const struct device *dev, struct sms_in *sms, int csms_ref,
+			 int csms_idx, int csms_tot)
+{
+	ARG_UNUSED(dev);
+	const struct shell *sh = shell_backend_uart_get_ptr();
+
+	shell_print(sh, "SMS Received [%d/%d] from %s, sent at %s:\n%s", 
+			csms_idx, csms_tot, sms->phone, sms->time, sms->msg);
+	
+}
+
+static struct sms_recv_cb recv_cb = {
+	.recv = on_sms_recv,
+};
+
+static int sms_recv_cb_init(const struct device *unused)
+{
+	ARG_UNUSED(unused);
+
+	const struct device *dev = DEVICE_DT_GET(DT_NODELABEL(murata_1sc));
+
+	sms_recv_cb_register(&recv_cb);
+	sms_recv_cb_en(dev, 1);
+
+	return 0;
+}
+
+SYS_INIT(sms_recv_cb_init, APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
+#endif /* CONFIG_MODEM_SMS && CONFIG_TMO_SHELL_ASYNC_SMS */

samples/tmo_shell/src/tmo_shell.c

@@ -38,7 +38,7 @@ typedef int sec_tag_t;
 
 #if CONFIG_MODEM
 #include <zephyr/drivers/modem/murata-1sc.h>
-#include "modem_sms.h"
+#include <zephyr/drivers/modem/sms.h>
 #endif
 
 #include "tmo_http_request.h"
@@ -1102,7 +1102,7 @@ int sock_close(const struct shell *shell, size_t argc, char **argv)
 	return stat;
 }
 
-#if CONFIG_MODEM
+#if CONFIG_MODEM  && CONFIG_MODEM_SMS
 int sock_sendsms(const struct shell *shell, size_t argc, char **argv)
 {
 	int ret;
@@ -1132,7 +1132,6 @@ int sock_sendsms(const struct shell *shell, size_t argc, char **argv)
 	strncpy(sms.phone, argv[2], SMS_PHONE_MAX_LEN);
 	strncpy(sms.msg, argv[3], CONFIG_MODEM_SMS_OUT_MSG_MAX_LEN + 1);
 	ret = fcntl_ptr(sock_idx, SMS_SEND, &sms);
-
 	return ret;
 }
 
@@ -1169,7 +1168,8 @@ int sock_recvsms(const struct shell *shell, size_t argc, char **argv)
 		shell_print(shell, "No SMS received!");
 	return ret;
 }
-#endif /* CONFIG_MODEM */
+#endif /* CONFIG_MODEM && CONFIG_MODEM_SMS */
+
 int cmd_list_socks(const struct shell *shell, size_t argc, char **argv)
 {
 	enum proto_idx {
@@ -1342,9 +1342,9 @@ SHELL_STATIC_SUBCMD_SET_CREATE(tmo_tcp_sub,
 #endif
 		SHELL_CMD(recv, NULL, "<socket>", tcp_rcv),
 		SHELL_CMD(recvb, NULL,  "<socket> <size>", tcp_recvb),
-#if CONFIG_MODEM
+#if CONFIG_MODEM && CONFIG_MODEM_SMS
 		SHELL_CMD(recvsms, NULL, "<socket> <wait time (seconds)>", sock_recvsms),
-#endif /* CONFIG_MODEM */
+#endif /* CONFIG_MODEM && CONFIG_MODEM_SMS */
 #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS)
 		SHELL_CMD(secure_create, NULL, "<iface>", tcp_create_tls),
 #if IS_ENABLED(CONFIG_NET_IPV6)
@@ -1353,9 +1353,9 @@ SHELL_STATIC_SUBCMD_SET_CREATE(tmo_tcp_sub,
 #endif
 		SHELL_CMD(send, NULL, "<socket> <payload>", tcp_send),
 		SHELL_CMD(sendb, NULL,  "<socket> <size>", tcp_sendb),
-#if CONFIG_MODEM
+#if CONFIG_MODEM && CONFIG_MODEM_SMS
 		SHELL_CMD(sendsms, NULL, "<socket> <phone number> <message>", sock_sendsms),
-#endif /* CONFIG_MODEM */
+#endif /* CONFIG_MODEM && CONFIG_MODEM_SMS */
 		SHELL_CMD(xfersz, NULL,  "[size]", sock_mxfragment),
 		SHELL_SUBCMD_SET_END
 		);

samples/tmo_shell/src/tmo_web_demo.c

@@ -13,7 +13,6 @@
 #include <zephyr/net/net_ip.h>
 #include <zephyr/net/socket.h>
 #if CONFIG_MODEM
-#include "modem_sms.h"
 #include <zephyr/drivers/modem/murata-1sc.h>
 #endif