fix: update from upstream

GitHub Actions · GitHub Actions · commit 5d4db969453d · 2021-07-09T00:28:09.000Z
See https://github.com/nrfconnect/sdk-nrf/tree/55ae470380f17a949fe45b7686cf5c8743d5fb30/applications/asset_tracker_v2
diff --git a/README.rst b/README.rst
@@ -64,6 +64,8 @@ Data types
 Data from multiple sensor sources are collected to construct information about the location, environment, and the health of the nRF9160-based device.
 The application supports the following data types:
 
+.. _app_data_types:
+
 +----------------+----------------------------+-----------------------------------------------+
 | Data type      | Description                | Identifiers                                   |
 +================+============================+===============================================+
@@ -89,26 +91,29 @@ The application can be either in an active or in a passive state depending on th
 The device mode is a part of the application's real-time configurations.
 The device modes and their descriptions are listed in the following table:
 
-+-------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------+----------------+
-| Real-time Configurations            | Description                                                                                                                                 | Default values |
-+=====================================+=============================================================================================================================================+================+
-| Device mode                         | Either in active or passive mode.                                                                                                           | Active         |
-+---------------+---------------------+---------------------------------------------------------------------------------------------------------------------------------------------+----------------+
-|  Active       |                     | Sample and publish data at regular intervals.                                                                                               |                |
-|               +---------------------+---------------------------------------------------------------------------------------------------------------------------------------------+----------------+
-|               | Active wait time    | Number of seconds between each sampling/publication.                                                                                        | 120 seconds    |
-+---------------+---------------------+---------------------------------------------------------------------------------------------------------------------------------------------+----------------+
-|  Passive      |                     | Sample and publish data only if movement has been detected.                                                                                 |                |
-|               +---------------------+---------------------------------------------------------------------------------------------------------------------------------------------+----------------+
-|               | Movement resolution | Sample and publish data after detecting movement.                                                                                           |                |
-|               |                     | Wait for a duration specified by the parameter until a movement triggers the next update.                                                   | 120 seconds    |
-|               +---------------------+---------------------------------------------------------------------------------------------------------------------------------------------+----------------+
-|               | Movement timeout    | Sample and publish data at a minimum of the time interval specified by the parameter. Not dependent on movement.                            | 3600 seconds   |
-+---------------+---------------------+---------------------------------------------------------------------------------------------------------------------------------------------+----------------+
-| GPS timeout                         | Timeout for acquiring a GPS fix during sampling of the data.                                                                                | 60 seconds     |
-+-------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------+----------------+
-| Accelerometer threshold             | Accelerometer threshold in m/s². Minimal absolute value in m/s² for the accelerometer readings to be considered as a valid movement.        | 10 m/s²        |
-+-------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------+----------------+
++--------------------------------+--------------------------------------------------------------------------------------------------------------------------------------+----------------+
+| Real-time Configurations       | Description                                                                                                                          | Default values |
++================================+======================================================================================================================================+================+
+| Device mode                    | Either in active or passive mode.                                                                                                    | Active         |
++----------+---------------------+--------------------------------------------------------------------------------------------------------------------------------------+----------------+
+|  Active  |                     | Sample and publish data at regular intervals.                                                                                        |                |
+|          +---------------------+--------------------------------------------------------------------------------------------------------------------------------------+----------------+
+|          | Active wait time    | Number of seconds between each sampling/publication.                                                                                 | 120 seconds    |
++----------+---------------------+--------------------------------------------------------------------------------------------------------------------------------------+----------------+
+|  Passive |                     | Sample and publish data only if movement has been detected.                                                                          |                |
+|          +---------------------+--------------------------------------------------------------------------------------------------------------------------------------+----------------+
+|          | Movement resolution | Sample and publish data after detecting movement.                                                                                    |                |
+|          |                     | Wait for a duration specified by the parameter until a movement triggers the next update.                                            | 120 seconds    |
+|          +---------------------+--------------------------------------------------------------------------------------------------------------------------------------+----------------+
+|          | Movement timeout    | Sample and publish data at a minimum of the time interval specified by the parameter. Not dependent on movement.                     | 3600 seconds   |
++----------+---------------------+--------------------------------------------------------------------------------------------------------------------------------------+----------------+
+| GPS timeout                    | Timeout for acquiring a GPS fix during sampling of the data.                                                                         | 60 seconds     |
++--------------------------------+--------------------------------------------------------------------------------------------------------------------------------------+----------------+
+| Accelerometer threshold        | Accelerometer threshold in m/s². Minimal absolute value in m/s² for the accelerometer readings to be considered as a valid movement. | 10 m/s²        |
++--------------------------------+--------------------------------------------------------------------------------------------------------------------------------------+----------------+
+| No Data List (NOD)             | List containing :ref:`data types <app_data_types>` that is not included when the application samples data.                           | No entries     |
+|                                | Currently, the application supports only APP_DATA_GNSS and APP_DATA_NEIGHBOR_CELLS.                                                  | (Request all)  |
++--------------------------------+--------------------------------------------------------------------------------------------------------------------------------------+----------------+
 
 See :ref:`Kconfig options for default device configuration values <default_config_values>` for a list of configuration options that can set the default values of the device configuration parameters.
 
diff --git a/src/cloud/cloud_codec/cloud_codec.h b/src/cloud/cloud_codec/cloud_codec.h
@@ -80,6 +80,17 @@ struct cloud_data_gps {
 	bool queued : 1;
 };
 
+/** Structure containing boolean variables used to enable/disable inclusion of the corresponding
+ *  data type in sample requests sent out by the application module.
+ */
+struct cloud_data_no_data {
+	/** If this flag is set GNSS data is not included in sample requests. */
+	bool gnss;
+
+	/** If this flag is set neighbor cell data is not included sample requests. */
+	bool neighbor_cell;
+};
+
 struct cloud_data_cfg {
 	/** Device mode. */
 	bool active_mode;
@@ -95,6 +106,8 @@ struct cloud_data_cfg {
 	int movement_timeout;
 	/** Accelerometer trigger threshold value in m/s2. */
 	double accelerometer_threshold;
+	/** Variable used to govern what data types are requested by the application. */
+	struct cloud_data_no_data no_data;
 
 	/** Flags to signify if the corresponding data value is fresh and can be used. */
 	bool active_mode_fresh		   : 1;
@@ -103,6 +116,7 @@ struct cloud_data_cfg {
 	bool movement_resolution_fresh	   : 1;
 	bool movement_timeout_fresh	   : 1;
 	bool accelerometer_threshold_fresh : 1;
+	bool nod_list_fresh		   : 1;
 };
 
 struct cloud_data_accelerometer {
diff --git a/src/cloud/cloud_codec/json_common.c b/src/cloud/cloud_codec/json_common.c
@@ -840,6 +840,48 @@ int json_common_config_add(cJSON *parent, struct cloud_data_cfg *data, const cha
 		values_added = true;
 	}
 
+	if (data->nod_list_fresh) {
+		cJSON *nod_list = cJSON_CreateArray();
+
+		if (nod_list == NULL) {
+			err = -ENOMEM;
+			goto exit;
+		}
+
+		/* If a flag in the no_data structure is set to true the corresponding JSON entry is
+		 * added to the no data array configuration.
+		 */
+		if (data->no_data.gnss) {
+			cJSON *gnss_str = cJSON_CreateString(CONFIG_NO_DATA_LIST_GNSS);
+
+			if (gnss_str == NULL) {
+				cJSON_Delete(nod_list);
+				err = -ENOMEM;
+				goto exit;
+			}
+
+			json_add_obj_array(nod_list, gnss_str);
+		}
+
+		if (data->no_data.neighbor_cell) {
+			cJSON *ncell_str = cJSON_CreateString(CONFIG_NO_DATA_LIST_NEIGHBOR_CELL);
+
+			if (ncell_str == NULL) {
+				cJSON_Delete(nod_list);
+				err = -ENOMEM;
+				goto exit;
+			}
+
+			json_add_obj_array(nod_list, ncell_str);
+		}
+
+		/* If there are no flag set in the no_data structure, an empty array is
+		 * encoded.
+		 */
+		values_added = true;
+		json_add_obj(config_obj, CONFIG_NO_DATA_LIST, nod_list);
+	}
+
 	if (!values_added) {
 		err = -ENODATA;
 		LOG_WRN("No valid configuration data values present");
@@ -863,6 +905,7 @@ void json_common_config_get(cJSON *parent, struct cloud_data_cfg *data)
 	cJSON *move_res = cJSON_GetObjectItem(parent, CONFIG_MOVE_RES);
 	cJSON *move_timeout = cJSON_GetObjectItem(parent, CONFIG_MOVE_TIMEOUT);
 	cJSON *acc_thres = cJSON_GetObjectItem(parent, CONFIG_ACC_THRESHOLD);
+	cJSON *nod_list = cJSON_GetObjectItem(parent, CONFIG_NO_DATA_LIST);
 
 	if (gps_timeout != NULL) {
 		data->gps_timeout = gps_timeout->valueint;
@@ -887,6 +930,30 @@ void json_common_config_get(cJSON *parent, struct cloud_data_cfg *data)
 	if (acc_thres != NULL) {
 		data->accelerometer_threshold = acc_thres->valuedouble;
 	}
+
+	if (nod_list != NULL && cJSON_IsArray(nod_list)) {
+		cJSON *item;
+		bool gnss_found = false;
+		bool ncell_found = false;
+
+		for (int i = 0; i < cJSON_GetArraySize(nod_list); i++) {
+			item = cJSON_GetArrayItem(nod_list, i);
+
+			if (strcmp(item->valuestring, CONFIG_NO_DATA_LIST_GNSS) == 0) {
+				gnss_found = true;
+			}
+
+			if (strcmp(item->valuestring, CONFIG_NO_DATA_LIST_NEIGHBOR_CELL) == 0) {
+				ncell_found = true;
+			}
+		}
+
+		/* If a supported entry is present in the no data list we set the corresponding flag
+		 * to true. Signifying that no data is to be sampled for that data type.
+		 */
+		data->no_data.gnss = gnss_found;
+		data->no_data.neighbor_cell = ncell_found;
+	}
 }
 
 int json_common_batch_data_add(cJSON *parent, enum json_common_buffer_type type, void *buf,
diff --git a/src/cloud/cloud_codec/json_protocol_names.h b/src/cloud/cloud_codec/json_protocol_names.h
@@ -64,12 +64,15 @@
 #define DATA_NEIGHBOR_CELLS_NEIGHBOR_MEAS "nmr"
 #define DATA_NEIGHBOR_CELLS_PCI		  "cell"
 
-#define CONFIG_DEVICE_MODE	"activeMode"
-#define CONFIG_ACTIVE_TIMEOUT	"activeWaitTime"
-#define CONFIG_MOVE_TIMEOUT	"movementTimeout"
-#define CONFIG_MOVE_RES		"movementResolution"
-#define CONFIG_GPS_TIMEOUT	"gpsTimeout"
-#define CONFIG_ACC_THRESHOLD	"movementThreshold"
+#define CONFIG_DEVICE_MODE		  "activeMode"
+#define CONFIG_ACTIVE_TIMEOUT		  "activeWaitTime"
+#define CONFIG_MOVE_TIMEOUT		  "movementTimeout"
+#define CONFIG_MOVE_RES			  "movementResolution"
+#define CONFIG_GPS_TIMEOUT		  "gpsTimeout"
+#define CONFIG_ACC_THRESHOLD		  "movementThreshold"
+#define CONFIG_NO_DATA_LIST		  "nod"
+#define CONFIG_NO_DATA_LIST_GNSS	  "gnss"
+#define CONFIG_NO_DATA_LIST_NEIGHBOR_CELL "ncell"
 
 #define OBJECT_CONFIG		"config"
 #define OBJECT_REPORTED		"reported"
@@ -97,12 +100,15 @@
 #define MODEM_CELL_ID		"cell"
 #define MODEM_IP_ADDRESS	"ip"
 
-#define CONFIG_DEVICE_MODE	"act"
-#define CONFIG_ACTIVE_TIMEOUT	"actwt"
-#define CONFIG_MOVE_TIMEOUT	"mvt"
-#define CONFIG_MOVE_RES		"mvres"
-#define CONFIG_GPS_TIMEOUT	"gpst"
-#define CONFIG_ACC_THRESHOLD	"acct"
+#define CONFIG_DEVICE_MODE		  "act"
+#define CONFIG_ACTIVE_TIMEOUT		  "actwt"
+#define CONFIG_MOVE_TIMEOUT		  "mvt"
+#define CONFIG_MOVE_RES			  "mvres"
+#define CONFIG_GPS_TIMEOUT		  "gpst"
+#define CONFIG_ACC_THRESHOLD		  "acct"
+#define CONFIG_NO_DATA_LIST		  "nod"
+#define CONFIG_NO_DATA_LIST_GNSS	  "gnss"
+#define CONFIG_NO_DATA_LIST_NEIGHBOR_CELL "ncell"
 
 #define DATA_VALUE		"v"
 #define DATA_TIMESTAMP		"ts"
diff --git a/src/main.c b/src/main.c
@@ -325,43 +325,47 @@ static void data_get(void)
 	struct app_module_event *app_module_event = new_app_module_event();
 	size_t count = 0;
 
+	/* Specify a timeout that each module has to fetch data. If data is not
+	 * fetched within this timeout, the data that is available is sent.
+	 */
+	app_module_event->timeout = 10;
+
 	/* Specify which data that is to be included in the transmission. */
 	app_module_event->data_list[count++] = APP_DATA_MODEM_DYNAMIC;
 	app_module_event->data_list[count++] = APP_DATA_BATTERY;
 	app_module_event->data_list[count++] = APP_DATA_ENVIRONMENTAL;
 
-	if (IS_ENABLED(CONFIG_APP_REQUEST_NEIGHBOR_CELLS_DATA)) {
+	if (IS_ENABLED(CONFIG_APP_REQUEST_NEIGHBOR_CELLS_DATA) && !app_cfg.no_data.neighbor_cell) {
 		app_module_event->data_list[count++] = APP_DATA_NEIGHBOR_CELLS;
 	}
 
-	/* Specify a timeout that each module has to fetch data. If data is not
-	 * fetched within this timeout, the data that is available is sent.
-	 *
-	 * The reason for having at least 65 seconds timeout is that the GNSS
-	 * module in nRF9160 will always search for at least 60 seconds for the
+	/* The reason for having at least 75 seconds timeout in the case of requesting GNSS data
+	 * is that the GNSS module in nRF9160 will always search for at least 60 seconds for the
 	 * first position fix after a reboot.
 	 *
-	 * The addition of 5 seconds to the configured GPS timeout is  done
+	 * The addition of 15 seconds to the configured GPS timeout is done
 	 * to let the GPS module run the currently ongoing search until
 	 * the end. If the timeout for sending data is exactly the same as for
 	 * the GPS search, a fix occurring at the same time as timeout is
 	 * triggered will be missed and not sent to cloud before the next
 	 * interval has  passed in active mode, or until next movement in
 	 * passive mode.
 	 */
-	app_module_event->timeout = MAX(app_cfg.gps_timeout + 15, 75);
 
 	if (first) {
-		if (IS_ENABLED(CONFIG_APP_REQUEST_GPS_ON_INITIAL_SAMPLING)) {
+		if (IS_ENABLED(CONFIG_APP_REQUEST_GPS_ON_INITIAL_SAMPLING) &&
+		    !app_cfg.no_data.gnss) {
 			app_module_event->data_list[count++] = APP_DATA_GNSS;
-		} else {
-			app_module_event->timeout = 10;
+			app_module_event->timeout = MAX(app_cfg.gps_timeout + 15, 75);
 		}
 
 		app_module_event->data_list[count++] = APP_DATA_MODEM_STATIC;
 		first = false;
 	} else {
-		app_module_event->data_list[count++] = APP_DATA_GNSS;
+		if (!app_cfg.no_data.gnss) {
+			app_module_event->data_list[count++] = APP_DATA_GNSS;
+			app_module_event->timeout = MAX(app_cfg.gps_timeout + 15, 75);
+		}
 	}
 
 	/* Set list count to number of data types passed in app_module_event. */
diff --git a/src/modules/Kconfig.app_module b/src/modules/Kconfig.app_module
@@ -12,9 +12,12 @@ config APP_REQUEST_GPS_ON_INITIAL_SAMPLING
 
 config APP_REQUEST_NEIGHBOR_CELLS_DATA
 	bool "Request neighbor cells data"
+	depends on AWS_IOT
+	default y
 	help
 	  Include LTE neighbor cell measurement data in regular sampling requests.
 	  The data will be encoded together with the other sampled data and sent to cloud,
 	  where it can be used to determine the device's location.
+	  Currently this option is only implemented when configuring for AWS IoT.
 
 endmenu
diff --git a/src/modules/Kconfig.data_module b/src/modules/Kconfig.data_module
@@ -135,6 +135,22 @@ config DATA_GPS_TIMEOUT_SECONDS
 	help
 	  Timeout for acquiring a GPS fix during sampling of data.
 
+config DATA_SAMPLE_GNSS_DEFAULT
+	bool "Include GNSS in sample requests"
+	default y
+	help
+	  If this configuration is enabled the application will by default include GNSS data in
+	  sample requests sent to other modules. This configuration can be overwritten by changing
+	  the application's real-time configuration using the cloud-side state.
+
+config DATA_SAMPLE_NEIGHBOR_CELLS_DEFAULT
+	bool "Include neighbor cells in sample requests"
+	default y
+	help
+	  If this configuration is enabled the application will by default include neighbor cell
+	  data in sample requests sent to other modules. This configuration can be overwritten by
+	  changing the application's real-time configuration using the cloud-side state.
+
 endif # DATA_MODULE
 
 module = DATA_MODULE
diff --git a/src/modules/data_module.c b/src/modules/data_module.c
diff --git a/tests/json_common/src/json_validate.h b/tests/json_common/src/json_validate.h
diff --git a/tests/json_common/src/main.c b/tests/json_common/src/main.c
