sbdt: disable sidewalk file transfer when in DFU mode

To prevent conflict with SMP DFU, disable sbdt Signed-off-by: Robert Gałat <[email protected]>
nrfconnect · Nov 19, 2024 · 0ca10a7 · 0ca10a7
1 parent caa1e20
commit 0ca10a7
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 0 deletions.
diff --git a/samples/sid_end_device/include/sbdt/dfu_file_transfer.h b/samples/sid_end_device/include/sbdt/dfu_file_transfer.h
@@ -24,6 +24,28 @@ void app_file_transfer_demo_init(struct sid_handle *handle);
  */
 void app_file_transfer_demo_deinit(struct sid_handle *handle);
 
+/**
+ * @brief Sidewalk event to handle payload of file transfer
+ * 
+ * @param sid sidewalk_ctx_t object
+ * @param ctx sidewalk_transfer_t object
+ */
 void sidewalk_event_file_transfer(sidewalk_ctx_t *sid, void *ctx);
 
+/**
+ * @brief Sidewalk event to deinit sbdt
+ * 
+ * @param sid sidewalk_ctx_t object
+ * @param ctx Ignored
+ */
+void sidewalk_event_file_transfer_deinit(sidewalk_ctx_t *sid, void *ctx);
+
+/**
+ * @brief Sidewalk event to init sbdt
+ * 
+ * @param sid sidewalk_ctx_t object
+ * @param ctx Ignored
+ */
+void sidewalk_event_file_transfer_init(sidewalk_ctx_t *sid, void *ctx);
+
 #endif /* FILE_TRANSFER_H */
diff --git a/samples/sid_end_device/src/cli/app_shell.c b/samples/sid_end_device/src/cli/app_shell.c
@@ -27,6 +27,8 @@
 #include <sidewalk_dfu/nordic_dfu.h>
 #endif
 
+#include <sbdt/dfu_file_transfer.h>
+
 #define CLI_CMD_OPT_LINK_BLE 1
 #define CLI_CMD_OPT_LINK_FSK 2
 #define CLI_CMD_OPT_LINK_LORA 3
@@ -303,6 +305,7 @@ static void app_event_enter_dfu_mode(sidewalk_ctx_t *sid, void *ctx)
 // shell handlers
 int cmd_nordic_dfu(const struct shell *shell, int32_t argc, const char **argv)
 {
+	sidewalk_event_send(sidewalk_event_file_transfer_deinit, NULL, NULL);
 	sidewalk_event_send(app_event_enter_dfu_mode, (void *)shell, NULL);
 	return 0;
 }

diff --git a/samples/sid_end_device/src/hello/app.c b/samples/sid_end_device/src/hello/app.c
@@ -12,6 +12,7 @@
 #include <sid_hal_reset_ifc.h>
 #include <sid_hal_memory_ifc.h>
 #include <stdbool.h>
+#include <sbdt/dfu_file_transfer.h>
 
 #include <sid_ble_uuid.h>
 #include <bt_app_callbacks.h>
@@ -278,9 +279,11 @@ static void app_btn_dfu_state(uint32_t unused)
 	ARG_UNUSED(unused);
 	static bool go_to_dfu_state = true;
 	if (go_to_dfu_state) {
+		sidewalk_event_send(sidewalk_event_file_transfer_deinit, NULL, NULL);
 		sidewalk_event_send(app_event_enter_dfu_mode, NULL, NULL);
 	} else {
 		sidewalk_event_send(app_event_exit_dfu_mode, NULL, NULL);
+		sidewalk_event_send(sidewalk_event_file_transfer_init, NULL, NULL);
 	}
 
 	go_to_dfu_state = !go_to_dfu_state;

diff --git a/samples/sid_end_device/src/sbdt/dfu_file_transfer.c b/samples/sid_end_device/src/sbdt/dfu_file_transfer.c
@@ -232,3 +232,13 @@ void app_file_transfer_demo_deinit(struct sid_handle *handle)
 		LOG_ERR("sid_bulk_data_transfer_deinit returned %s", SID_ERROR_T_STR(err));
 	}
 }
+
+void sidewalk_event_file_transfer_deinit(sidewalk_ctx_t *sid, void *ctx)
+{
+	app_file_transfer_demo_deinit(sid->handle);
+}
+
+void sidewalk_event_file_transfer_init(sidewalk_ctx_t *sid, void *ctx)
+{
+	app_file_transfer_demo_init(sid->handle);
+}
diff --git a/samples/sid_end_device/src/sensor_monitoring/app.c b/samples/sid_end_device/src/sensor_monitoring/app.c
@@ -20,6 +20,7 @@
 #include <zephyr/logging/log.h>
 #include <sid_demo_parser.h>
 #include <json_printer/sidTypes2str.h>
+#include <sbdt/dfu_file_transfer.h>
 
 #include <sid_ble_uuid.h>
 #include <bt_app_callbacks.h>
@@ -189,9 +190,11 @@ static void app_btn_dfu_state(uint32_t unused)
 	ARG_UNUSED(unused);
 	static bool go_to_dfu_state = true;
 	if (go_to_dfu_state) {
+		sidewalk_event_send(sidewalk_event_file_transfer_deinit, NULL, NULL);
 		sidewalk_event_send(app_event_enter_dfu_mode, NULL, NULL);
 	} else {
 		sidewalk_event_send(app_event_exit_dfu_mode, NULL, NULL);
+		sidewalk_event_send(sidewalk_event_file_transfer_init, NULL, NULL);
 	}
 
 	go_to_dfu_state = !go_to_dfu_state;