app: minor fixes

- Add logic to that tracks the cloud connection status during FOTA
  to be able to return to the correct state if FOTA fails.
- Fix typo in AT command example in documentation.

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

Author: simensrostad

app/src/main.c

@@ -416,8 +416,6 @@ static void running_entry(void *o)
 		smf_set_state(SMF_CTX(state_object), &states[STATE_TRIGGERING]);
 		return;
 	}
-
-	smf_set_state(SMF_CTX(state_object), &states[STATE_IDLE]);
 }
 
 static void running_run(void *o)
@@ -694,7 +692,7 @@ static void fota_entry(void *o)
 
 static void fota_run(void *o)
 {
-	const struct main_state *state_object = (const struct main_state *)o;
+	struct main_state *state_object = (struct main_state *)o;
 
 	if (state_object->chan == &FOTA_CHAN) {
 		enum fota_msg_type msg = MSG_TO_FOTA_TYPE(state_object->msg_buf);
@@ -705,13 +703,30 @@ static void fota_run(void *o)
 		case FOTA_DOWNLOAD_TIMED_OUT:
 			__fallthrough;
 		case FOTA_DOWNLOAD_FAILED:
-			smf_set_state(SMF_CTX(state_object), &states[STATE_RUNNING]);
+			if (state_object->connected) {
+				smf_set_state(SMF_CTX(state_object), &states[STATE_TRIGGERING]);
+			} else {
+				smf_set_state(SMF_CTX(state_object), &states[STATE_IDLE]);
+			}
 			return;
 		default:
 			/* Don't care */
 			break;
 		}
 	}
+
+	/* Update cloud connection status to be able to return to the correct state in case
+	 * cloud connection is lost during FOTA.
+	 */
+	if (state_object->chan == &CLOUD_CHAN) {
+		const struct cloud_msg *msg = MSG_TO_CLOUD_MSG_PTR(state_object->msg_buf);
+
+		if (msg->type == CLOUD_DISCONNECTED) {
+			state_object->connected = false;
+		} else if (msg->type == CLOUD_CONNECTED) {
+			state_object->connected = true;
+		}
+	}
 }
 
 /* STATE_FOTA_DOWNLOADING */

docs/common/provisioning.md

@@ -7,7 +7,7 @@ Device provisioning establishes credentials for secure communication with nRF Cl
 1. Get the device attestation token:
 
    ```bash
-   at at%attesttoken?
+   at at%attesttoken
    ```
 
    *Note: Token is printed automatically on first boot of unprovisioned devices.*

tests/module/main/src/main.c

@@ -346,7 +346,7 @@ void test_trigger_disconnect_and_connect_when_triggering(void)
 	expect_no_events(WEEK_IN_SECONDS);
 }
 
-void test_fota_downloading(void)
+void test_fota_downloading_cancel_to_state_idle(void)
 {
 	/* Transition to STATE_FOTA_DOWNLOADING */
 	send_fota_msg(FOTA_DOWNLOADING_UPDATE);
@@ -359,12 +359,44 @@ void test_fota_downloading(void)
 	expect_no_events(7200);
 
 	/* Cleanup */
+	send_cloud_disconnected();
 	send_fota_msg(FOTA_DOWNLOAD_CANCELED);
 	expect_fota_event(FOTA_DOWNLOAD_CANCELED);
 
 	expect_no_events(7200);
 }
 
+void test_fota_downloading_cancel_to_state_triggering(void)
+{
+	/* Transition to STATE_FOTA_DOWNLOADING */
+	send_fota_msg(FOTA_DOWNLOADING_UPDATE);
+	expect_fota_event(FOTA_DOWNLOADING_UPDATE);
+
+	/* A cloud ready message and button trigger should now cause no action */
+	send_cloud_connected();
+	expect_no_events(7200);
+	button_handler(DK_BTN1_MSK, DK_BTN1_MSK);
+	expect_no_events(7200);
+
+	/* Cleanup */
+	send_fota_msg(FOTA_DOWNLOAD_CANCELED);
+	expect_fota_event(FOTA_DOWNLOAD_CANCELED);
+
+	expect_location_event(LOCATION_SEARCH_TRIGGER);
+
+	send_location_search_done();
+	expect_location_event(LOCATION_SEARCH_TRIGGER);
+	expect_location_event(LOCATION_SEARCH_DONE);
+	expect_fota_event(FOTA_POLL_REQUEST);
+	expect_network_event(NETWORK_QUALITY_SAMPLE_REQUEST);
+	expect_power_event(POWER_BATTERY_PERCENTAGE_SAMPLE_REQUEST);
+
+	/* Cleanup */
+	send_cloud_disconnected();
+	expect_location_event(LOCATION_SEARCH_CANCEL);
+	expect_no_events(7200);
+}
+
 void test_fota_waiting_for_network_disconnect(void)
 {
 	/* Transition to STATE_FOTA_WAITING_FOR_NETWORK_DISCONNECT */

tests/state_machines/source_of_truth/main.puml

@@ -6,19 +6,14 @@ state STATE_RUNNING {
         state STATE_WAIT_FOR_TRIGGER
 
         [*] --> STATE_SAMPLE_DATA
-
-        STATE_SAMPLE_DATA --> STATE_WAIT_FOR_TRIGGER: LOCATION_SEARCH_DONE
-        STATE_WAIT_FOR_TRIGGER --> STATE_SAMPLE_DATA: TIMER_CHAN
-        STATE_WAIT_FOR_TRIGGER --> STATE_SAMPLE_DATA: BUTTON_CHAN
     }
-    [*] --> STATE_IDLE
 
-    STATE_RUNNING --> STATE_TRIGGERING: connected
-    STATE_RUNNING --> STATE_IDLE: not connected
-    STATE_RUNNING --> STATE_FOTA: FOTA_DOWNLOADING_UPDATE
+    [*] --> STATE_IDLE
 
     STATE_IDLE --> STATE_TRIGGERING: CLOUD_CONNECTED
     STATE_TRIGGERING --> STATE_IDLE: CLOUD_DISCONNECTED
+    STATE_SAMPLE_DATA --> STATE_WAIT_FOR_TRIGGER: LOCATION_SEARCH_DONE
+    STATE_WAIT_FOR_TRIGGER --> STATE_SAMPLE_DATA: TIMER || BUTTON
 }
 
 state STATE_FOTA {
@@ -32,13 +27,14 @@ state STATE_FOTA {
 
     STATE_FOTA_DOWNLOADING --> STATE_FOTA_WAITING_FOR_NETWORK_DISCONNECT: FOTA_SUCCESS_REBOOT_NEEDED
     STATE_FOTA_DOWNLOADING --> STATE_FOTA_WAITING_FOR_NETWORK_DISCONNECT_TO_APPLY_IMAGE: FOTA_IMAGE_APPLY_NEEDED
-
     STATE_FOTA_WAITING_FOR_NETWORK_DISCONNECT --> STATE_FOTA_REBOOTING: NETWORK_DISCONNECTED
     STATE_FOTA_WAITING_FOR_NETWORK_DISCONNECT_TO_APPLY_IMAGE --> STATE_FOTA_APPLYING_IMAGE: NETWORK_DISCONNECTED
     STATE_FOTA_APPLYING_IMAGE --> STATE_FOTA_REBOOTING: FOTA_SUCCESS_REBOOT_NEEDED
-
-    STATE_FOTA --> STATE_RUNNING: FOTA_DOWNLOAD_CANCELED || FOTA_DOWNLOAD_TIMED_OUT || FOTA_DOWNLOAD_FAILED
 }
 
 [*] --> STATE_RUNNING
+
+STATE_RUNNING --> STATE_FOTA: FOTA_DOWNLOADING_UPDATE
+STATE_FOTA --> STATE_TRIGGERING: FOTA_DOWNLOAD_CANCELED || FOTA_DOWNLOAD_TIMED_OUT || FOTA_DOWNLOAD_FAILED [connected]
+STATE_FOTA --> STATE_IDLE: FOTA_DOWNLOAD_CANCELED || FOTA_DOWNLOAD_TIMED_OUT || FOTA_DOWNLOAD_FAILED [!connected]
 @enduml