samples: cli: add BLE user config

Implemented dummy user config handler
(returns not implemented)

Signed-off-by: Krzysztof Taborowski <krzysztof.taborowski@nordicsemi.no>

Author: ktaborowski

samples/sid_end_device/include/cli/app_shell.h

@@ -229,6 +229,13 @@
 #define CMD_SID_SET_OPTION_LP_SET_ARG_OPTIONAL 1
 #define CMD_SID_OPTION_GSI_ARG_REQUIRED 1
 #define CMD_SID_OPTION_GSI_ARG_OPTIONAL 0
+#define CMD_SID_OPTION_BLE_CFG_DESCRIPTION                                                       \
+	"set <cfg_type> [inactivity_timeout]\n"                                                   \
+	"Set BLE user config (SID_OPTION_BLE_USER_CONFIG).\n"                                     \
+	"<cfg_type> 0=ADV, 1=CONN, 2=ADV_AND_CONN, 3=INACTIVITY_TIMEOUT.\n"                       \
+	"For cfg_type 3, <inactivity_timeout> (seconds) is required."
+#define CMD_SID_OPTION_BLE_CFG_ARG_REQUIRED 2
+#define CMD_SID_OPTION_BLE_CFG_ARG_OPTIONAL 1
 #define CMD_SID_LAST_STATUS_ARG_REQUIRED 1
 #define CMD_SID_LAST_STATUS_ARG_OPTIONAL 0
 #define CMD_SID_CONN_REQUEST_ARG_REQUIRED 2
@@ -271,6 +278,7 @@ int cmd_sid_option_c(const struct shell *shell, int32_t argc, const char **argv)
 int cmd_sid_option_ml(const struct shell *shell, int32_t argc, const char **argv);
 int cmd_sid_option_gc(const struct shell *shell, int32_t argc, const char **argv);
 int cmd_sid_option_sid_id(const struct shell *shell, int32_t argc, const char **argv);
+int cmd_sid_option_ble_cfg_set(const struct shell *shell, int32_t argc, const char **argv);
 
 int cmd_sid_last_status(const struct shell *shell, int32_t argc, const char **argv);
 int cmd_sid_conn_request(const struct shell *shell, int32_t argc, const char **argv);

samples/sid_end_device/src/cli/app_shell.c

@@ -16,6 +16,7 @@
 
 #include <sid_api.h>
 #include <sid_900_cfg.h>
+#include <sid_ble_config_ifc.h>
 #include <sid_hal_memory_ifc.h>
 
 #include <cli/app_shell.h>
@@ -79,6 +80,9 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      CMD_SID_SET_OPTION_GC_ARG_REQUIRED, CMD_SID_SET_OPTION_GC_ARG_OPTIONAL),
 	SHELL_CMD_ARG(-gsi, NULL, CMD_SID_OPTION_GSI_DESCRIPTION, cmd_sid_option_sid_id,
 		      CMD_SID_OPTION_GSI_ARG_REQUIRED, CMD_SID_OPTION_GSI_ARG_OPTIONAL),
+	SHELL_CMD_ARG(-ble_cfg, NULL, CMD_SID_OPTION_BLE_CFG_DESCRIPTION,
+		      cmd_sid_option_ble_cfg_set, CMD_SID_OPTION_BLE_CFG_ARG_REQUIRED,
+		      CMD_SID_OPTION_BLE_CFG_ARG_OPTIONAL),
 
 	SHELL_SUBCMD_SET_END);
 
@@ -989,6 +993,71 @@ int cmd_sid_option_gc(const struct shell *shell, int32_t argc, const char **argv
 	return 0;
 }
 
+int cmd_sid_option_ble_cfg_set(const struct shell *shell, int32_t argc, const char **argv)
+{
+	CHECK_ARGUMENT_COUNT(argc, CMD_SID_OPTION_BLE_CFG_ARG_REQUIRED,
+			     CMD_SID_OPTION_BLE_CFG_ARG_OPTIONAL);
+
+	if (strcmp(argv[1], "set") != 0) {
+		shell_error(shell, "First argument must be 'set'");
+		return -EINVAL;
+	}
+
+	long cfg_type_raw = 0l;
+	char *end = NULL;
+	cfg_type_raw = strtol(argv[2], &end, 0);
+	if (end == argv[2] || !IN_RANGE(cfg_type_raw, SID_BLE_USER_CFG_ADV,
+					SID_BLE_USER_CFG_INACTIVITY_TIMEOUT)) {
+		shell_error(shell, "cfg_type must be 0..3 (ADV, CONN, ADV_AND_CONN, INACTIVITY_TIMEOUT)");
+		return -EINVAL;
+	}
+
+	/* Use valid BLE defaults to avoid SID_ERROR_INCOMPATIBLE_PARAMS (-12).
+	 * Adv: same ranges as app_ble_config (interval in 0.625ms, timeout in 10ms).
+	 * Conn: interval in 1.25ms units, min <= max; timeout in 10ms.
+	 */
+	struct sid_ble_user_config cfg = {
+		.adv_param = {
+			.type = AMA_SERVICE,
+			.fast_enabled = true,
+			.slow_enabled = true,
+			.fast_interval = 256,
+			.fast_timeout = 3000,
+			.slow_interval = 1600,
+			.slow_timeout = 0,
+		},
+		.conn_param = {
+			.min_conn_interval = 6,    /* 7.5 ms */
+			.max_conn_interval = 3200, /* 4000 ms */
+			.slave_latency = 0,
+			.conn_sup_timeout = 400,   /* 4000 ms */
+		},
+		.is_set = true,
+		.cfg_type = (enum sid_ble_user_config_type)cfg_type_raw,
+		.inactivity_timeout = 0,
+	};
+
+	if (cfg.cfg_type == SID_BLE_USER_CFG_INACTIVITY_TIMEOUT) {
+		if (argc < 4) {
+			shell_error(shell, "inactivity_timeout required for cfg_type 3");
+			return -EINVAL;
+		}
+		unsigned long timeout = strtoul(argv[3], &end, 0);
+		if (end == argv[3] || timeout > UINT32_MAX) {
+			shell_error(shell, "Invalid inactivity_timeout");
+			return -EINVAL;
+		}
+		cfg.inactivity_timeout = (uint32_t)timeout;
+	}
+
+	int err = cmd_sid_option_set(SID_OPTION_BLE_USER_CONFIG, &cfg, sizeof(cfg));
+	if (err) {
+		shell_error(shell, "event err %d", err);
+	}
+
+	return 0;
+}
+
 int cmd_sid_last_status(const struct shell *shell, int32_t argc, const char **argv)
 {
 	CHECK_ARGUMENT_COUNT(argc, CMD_SID_LAST_STATUS_ARG_REQUIRED,

subsys/sal/sid_pal/src/sid_ble_adapter.c

@@ -9,6 +9,7 @@
  */
 
 #include <sid_error.h>
+#include <sid_ble_config_ifc.h>
 #include <sid_pal_ble_adapter_ifc.h>
 #include <sid_ble_service.h>
 #include <sid_ble_ama_service.h>
@@ -48,10 +49,12 @@ static sid_error_t ble_adapter_deinit(void);
 static sid_error_t ble_adapter_get_rssi(int8_t *rssi);
 static sid_error_t ble_adapter_get_tx_pwr(int16_t *tx_power);
 static sid_error_t ble_adapter_set_tx_pwr(int16_t tx_power);
+static sid_error_t ble_adapter_user_config(sid_ble_user_config_t *cfg);
 
 static struct sid_pal_ble_adapter_interface ble_ifc = {
 	.init = ble_adapter_init,
 	.start_service = ble_adapter_start_service,
+	.user_config = ble_adapter_user_config,
 	.set_adv_data = ble_adapter_set_adv_data,
 	.start_adv = ble_adapter_start_advertisement,
 	.stop_adv = ble_adapter_stop_advertisement,
@@ -379,6 +382,13 @@ static sid_error_t ble_adapter_send_data(sid_ble_cfg_service_identifier_t id, ui
 	return SID_ERROR_NONE;
 }
 
+static sid_error_t ble_adapter_user_config(sid_ble_user_config_t *cfg)
+{
+	ARG_UNUSED(cfg);
+	LOG_DBG("BLE user config: not implemented");
+	return SID_ERROR_NOSUPPORT;
+}
+
 static sid_error_t ble_adapter_set_callback(const sid_pal_ble_adapter_callbacks_t *cb)
 {
 	LOG_DBG("Sidewalk -> BLE");