modules: Update FOTA process

Include more states in app.c to differ between different FOTA
scenarios.

Signed-off-by: Simen S. Røstad <simen.rostad@nordicsemi.no>

Author: simensrostad

app/src/modules/app/app.c

@@ -62,6 +62,11 @@ static void idle_run(void *o);
 static void fota_entry(void *o);
 static void fota_run(void *o);
 
+static void fota_downloading_run(void *o);
+
+static void fota_network_disconnect_and_reboot_entry(void *o);
+static void fota_network_disconnect_and_reboot_run(void *o);
+
 static void fota_network_disconnect_pending_entry(void *o);
 static void fota_network_disconnect_pending_run(void *o);
 
@@ -84,6 +89,8 @@ enum state {
 	STATE_PERIODIC_TRIGGERING,
 	STATE_IDLE,
 	STATE_FOTA,
+	STATE_FOTA_DOWNLOADING,
+	STATE_FOTA_NETWORK_DISCONNECT_AND_REBOOT,
 	STATE_FOTA_NETWORK_DISCONNECT_PENDING,
 	STATE_FOTA_IMAGE_APPLY_PENDING,
 	STATE_FOTA_REBOOTING,
@@ -148,6 +155,20 @@ static const struct smf_state states[] = {
 		fota_run,
 		NULL,
 		NULL,
+		&states[STATE_FOTA_DOWNLOADING]
+	),
+	[STATE_FOTA_DOWNLOADING] = SMF_CREATE_STATE(
+		NULL,
+		fota_downloading_run,
+		NULL,
+		&states[STATE_FOTA],
+		NULL
+	),
+	[STATE_FOTA_NETWORK_DISCONNECT_AND_REBOOT] = SMF_CREATE_STATE(
+		fota_network_disconnect_and_reboot_entry,
+		fota_network_disconnect_and_reboot_run,
+		NULL,
+		&states[STATE_FOTA],
 		NULL
 	),
 	[STATE_FOTA_NETWORK_DISCONNECT_PENDING] = SMF_CREATE_STATE(
@@ -400,11 +421,25 @@ static void fota_run(void *o)
 		case FOTA_DOWNLOAD_FAILED:
 			STATE_SET(app_state, STATE_RUNNING);
 			return;
-		case FOTA_NETWORK_DISCONNECT_NEEDED:
-			STATE_SET(app_state, STATE_FOTA_NETWORK_DISCONNECT_PENDING);
-			return;
+		default:
+			/* Don't care */
+			break;
+		}
+	}
+}
+
+/* STATE_FOTA_DOWNLOADING */
+static void fota_downloading_run(void *o)
+{
+	const struct app_state_object *state_object = (const struct app_state_object *)o;
+
+	if (state_object->chan == &FOTA_CHAN) {
+		switch (state_object->fota_status) {
 		case FOTA_REBOOT_NEEDED:
-			STATE_SET(app_state, STATE_FOTA_REBOOTING);
+			STATE_SET(app_state, STATE_FOTA_NETWORK_DISCONNECT_AND_REBOOT);
+			return;
+		case FOTA_NETWORK_DISCONNECT_AND_APPLY_NEEDED:
+			STATE_SET(app_state, STATE_FOTA_NETWORK_DISCONNECT_PENDING);
 			return;
 		default:
 			/* Don't care */
@@ -413,6 +448,37 @@ static void fota_run(void *o)
 	}
 }
 
+/* STATE_FOTA_NETWORK_DISCONNECT_AND_REBOOT */
+
+static void fota_network_disconnect_and_reboot_entry(void *o)
+{
+	ARG_UNUSED(o);
+
+	LOG_DBG("%s", __func__);
+
+	int err;
+	struct network_msg msg = {
+		.type = NETWORK_DISCONNECT
+	};
+
+	err = zbus_chan_pub(&NETWORK_CHAN, &msg, K_SECONDS(1));
+	if (err) {
+		LOG_ERR("zbus_chan_pub, error: %d", err);
+		SEND_FATAL_ERROR();
+	}
+}
+
+static void fota_network_disconnect_and_reboot_run(void *o)
+{
+	const struct app_state_object *state_object = (const struct app_state_object *)o;
+
+	if (state_object->chan == &NETWORK_CHAN &&
+	    state_object->network_status == NETWORK_DISCONNECTED) {
+		STATE_SET(app_state, STATE_FOTA_REBOOTING);
+		return;
+	}
+}
+
 /* STATE_FOTA_NETWORK_DISCONNECT_PENDING */
 
 static void fota_network_disconnect_pending_entry(void *o)

app/src/modules/fota/fota.c

@@ -200,7 +200,7 @@ static void fota_status(enum nrf_cloud_fota_status status, const char *const sta
 	case NRF_CLOUD_FOTA_FMFU_VALIDATION_NEEDED:
 		LOG_DBG("Full Modem FOTA Update validation needed, network disconnect required");
 
-		evt = FOTA_NETWORK_DISCONNECT_NEEDED;
+		evt = FOTA_NETWORK_DISCONNECT_AND_APPLY_NEEDED;
 		break;
 	default:
 		LOG_DBG("Unknown FOTA status: %d", status);
@@ -354,7 +354,7 @@ static void state_downloading_update_run(void *o)
 		const enum fota_msg_type evt = MSG_TO_FOTA_TYPE(state_object->msg_buf);
 
 		switch (evt) {
-		case FOTA_NETWORK_DISCONNECT_NEEDED:
+		case FOTA_NETWORK_DISCONNECT_AND_APPLY_NEEDED:
 			STATE_SET(fota_state, STATE_WAITING_FOR_NETWORK_DISCONNECT);
 			break;
 		case FOTA_DOWNLOAD_FAILED:

app/src/modules/fota/fota.h

@@ -38,7 +38,7 @@ enum fota_msg_type {
 	/* Event notified when the module needs the network to disconnect in order to apply
 	 * an update. When network has been disconnect, send the event FOTA_APPLY_IMAGE.
 	 */
-	FOTA_NETWORK_DISCONNECT_NEEDED,
+	FOTA_NETWORK_DISCONNECT_AND_APPLY_NEEDED,
 
 	/* Event notified when the FOTA update has been canceled. */
 	FOTA_CANCELED,

tests/module/fota/src/fota_module_test.c

@@ -158,7 +158,7 @@ void test_fota_module_should_succeed(void)
 
 	/* 3. Download succeeded, validation needed */
 	invoke_nrf_cloud_fota_callback_stub_status(NRF_CLOUD_FOTA_FMFU_VALIDATION_NEEDED);
-	event_expect(FOTA_NETWORK_DISCONNECT_NEEDED);
+	event_expect(FOTA_NETWORK_DISCONNECT_AND_APPLY_NEEDED);
 
 	/* 4. Apply image */
 	event_send(FOTA_APPLY_IMAGE);