fix: update from upstream

See https://github.com/nrfconnect/sdk-nrf/tree/ce38bddef17b80cddfe2e3eb87139d45913f0936/applications/asset_tracker_v2

Author: GitHub Actions

README.rst

@@ -64,19 +64,21 @@ 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:
 
-+---------------+----------------------------+-----------------------------------------------+
-| Data type     | Description                | Identifiers                                   |
-+===============+============================+===============================================+
-| Location      | GNSS coordinates           | APP_DATA_GNSS                                 |
-+---------------+----------------------------+-----------------------------------------------+
-| Environmental | Temperature, humidity      | APP_DATA_ENVIRONMENTAL                        |
-+---------------+----------------------------+-----------------------------------------------+
-| Movement      | Acceleration               | APP_DATA_MOVEMENT                             |
-+---------------+----------------------------+-----------------------------------------------+
-| Modem         | LTE link data, device data | APP_DATA_MODEM_DYNAMIC, APP_DATA_MODEM_STATIC |
-+---------------+----------------------------+-----------------------------------------------+
-| Battery       | Voltage                    | APP_DATA_BATTERY                              |
-+---------------+----------------------------+-----------------------------------------------+
++----------------+----------------------------+-----------------------------------------------+
+| Data type      | Description                | Identifiers                                   |
++================+============================+===============================================+
+| Location       | GNSS coordinates           | APP_DATA_GNSS                                 |
++----------------+----------------------------+-----------------------------------------------+
+| Environmental  | Temperature, humidity      | APP_DATA_ENVIRONMENTAL                        |
++----------------+----------------------------+-----------------------------------------------+
+| Movement       | Acceleration               | APP_DATA_MOVEMENT                             |
++----------------+----------------------------+-----------------------------------------------+
+| Modem          | LTE link data, device data | APP_DATA_MODEM_DYNAMIC, APP_DATA_MODEM_STATIC |
++----------------+----------------------------+-----------------------------------------------+
+| Battery        | Voltage                    | APP_DATA_BATTERY                              |
++----------------+----------------------------+-----------------------------------------------+
+| Neighbor cells | Neighbor cell measurements | APP_DATA_NEIGHBOR_CELLS                       |
++----------------+----------------------------+-----------------------------------------------+
 
 The sets of sensor data that are published to the cloud service consist of relative `timestamps <Timestamping_>`_ that originate from the time of sampling.
 

src/cloud/aws_iot_integration.c

@@ -22,16 +22,19 @@ LOG_MODULE_REGISTER(MODULE, CONFIG_CLOUD_INTEGRATION_LOG_LEVEL);
 #define BATCH_TOPIC_LEN (AWS_CLOUD_CLIENT_ID_LEN + 6)
 #define MESSAGES_TOPIC "%s/messages"
 #define MESSAGES_TOPIC_LEN (AWS_CLOUD_CLIENT_ID_LEN + 9)
+#define NEIGHBOR_CELLS_TOPIC "%s/ncellmeas"
+#define NEIGHBOR_CELLS_TOPIC_LEN (AWS_CLOUD_CLIENT_ID_LEN + 10)
 
 #define APP_SUB_TOPICS_COUNT 1
-#define APP_PUB_TOPICS_COUNT 2
+#define APP_PUB_TOPICS_COUNT 3
 
 #define REQUEST_SHADOW_DOCUMENT_STRING ""
 
 static char client_id_buf[AWS_CLOUD_CLIENT_ID_LEN + 1];
 static char batch_topic[BATCH_TOPIC_LEN + 1];
 static char cfg_topic[CFG_TOPIC_LEN + 1];
 static char messages_topic[MESSAGES_TOPIC_LEN + 1];
+static char neighbor_cells_topic[NEIGHBOR_CELLS_TOPIC_LEN + 1];
 
 static struct aws_iot_topic_data sub_topics[APP_SUB_TOPICS_COUNT];
 static struct aws_iot_topic_data pub_topics[APP_PUB_TOPICS_COUNT];
@@ -71,6 +74,15 @@ static int populate_app_endpoint_topics(void)
 	pub_topics[1].str = messages_topic;
 	pub_topics[1].len = MESSAGES_TOPIC_LEN;
 
+	err = snprintf(neighbor_cells_topic, sizeof(neighbor_cells_topic),
+		       NEIGHBOR_CELLS_TOPIC, client_id_buf);
+	if (err != NEIGHBOR_CELLS_TOPIC_LEN) {
+		return -ENOMEM;
+	}
+
+	pub_topics[2].str = neighbor_cells_topic;
+	pub_topics[2].len = NEIGHBOR_CELLS_TOPIC_LEN;
+
 	err = snprintf(cfg_topic, sizeof(cfg_topic), CFG_TOPIC, client_id_buf);
 	if (err != CFG_TOPIC_LEN) {
 		return -ENOMEM;
@@ -347,3 +359,23 @@ int cloud_wrap_ui_send(char *buf, size_t len)
 
 	return 0;
 }
+
+int cloud_wrap_neighbor_cells_send(char *buf, size_t len)
+{
+	int err;
+	struct aws_iot_data msg = {
+		.ptr = buf,
+		.len = len,
+		.qos = MQTT_QOS_0_AT_MOST_ONCE,
+		/* <imei>/ncellmeas */
+		.topic = pub_topics[2]
+	};
+
+	err = aws_iot_send(&msg);
+	if (err) {
+		LOG_ERR("aws_iot_send, error: %d", err);
+		return err;
+	}
+
+	return 0;
+}

src/cloud/azure_iot_hub_integration.c

@@ -319,3 +319,9 @@ int cloud_wrap_ui_send(char *buf, size_t len)
 
 	return 0;
 }
+
+int cloud_wrap_neighbor_cells_send(char *buf, size_t len)
+{
+	/* Not supported */
+	return -ENOTSUP;
+}

src/cloud/cloud_codec/aws_iot_codec.c

@@ -49,6 +49,48 @@ static bool has_shadow_update_been_handled(cJSON *root_obj)
 	return retval;
 }
 
+int cloud_codec_encode_neighbor_cells(struct cloud_codec_data *output,
+				      struct cloud_data_neighbor_cells *neighbor_cells)
+{
+	int err;
+	char *buffer;
+
+	__ASSERT_NO_MSG(output != NULL);
+	__ASSERT_NO_MSG(neighbor_cells != NULL);
+
+	cJSON *root_obj = cJSON_CreateObject();
+
+	if (root_obj == NULL) {
+		cJSON_Delete(root_obj);
+		return -ENOMEM;
+	}
+
+	err = json_common_neighbor_cells_data_add(root_obj, neighbor_cells,
+						  JSON_COMMON_ADD_DATA_TO_OBJECT);
+	if (err) {
+		goto exit;
+	}
+
+	buffer = cJSON_PrintUnformatted(root_obj);
+	if (buffer == NULL) {
+		LOG_ERR("Failed to allocate memory for JSON string");
+
+		err = -ENOMEM;
+		goto exit;
+	}
+
+	if (IS_ENABLED(CONFIG_CLOUD_CODEC_LOG_LEVEL_DBG)) {
+		json_print_obj("Encoded message:\n", root_obj);
+	}
+
+	output->buf = buffer;
+	output->len = strlen(buffer);
+
+exit:
+	cJSON_Delete(root_obj);
+	return err;
+}
+
 int cloud_codec_decode_config(char *input, struct cloud_data_cfg *data)
 {
 	int err = 0;

src/cloud/cloud_codec/azure_iot_hub_codec.c

@@ -20,6 +20,16 @@
 #include <logging/log.h>
 LOG_MODULE_REGISTER(cloud_codec, CONFIG_CLOUD_CODEC_LOG_LEVEL);
 
+int cloud_codec_encode_neighbor_cells(struct cloud_codec_data *output,
+				      struct cloud_data_neighbor_cells *neighbor_cells)
+{
+	__ASSERT_NO_MSG(output != NULL);
+	__ASSERT_NO_MSG(neighbor_cells != NULL);
+
+	neighbor_cells->queued = false;
+	return -ENOTSUP;
+}
+
 int cloud_codec_decode_config(char *input, struct cloud_data_cfg *data)
 {
 	int err = 0;

src/cloud/cloud_codec/cloud_codec.h

@@ -14,6 +14,7 @@
 #include <stdlib.h>
 #include "cJSON_os.h"
 #include <net/net_ip.h>
+#include <modem/lte_lc.h>
 
 /**@file
  *
@@ -187,11 +188,21 @@ struct cloud_codec_data {
 	size_t len;
 };
 
+struct cloud_data_neighbor_cells {
+	struct lte_lc_cells_info cell_data;
+	struct lte_lc_ncell neighbor_cells[17];
+	int64_t ts;
+	bool queued : 1;
+};
+
 static inline void cloud_codec_init(void)
 {
 	cJSON_Init();
 }
 
+int cloud_codec_encode_neighbor_cells(struct cloud_codec_data *output,
+				      struct cloud_data_neighbor_cells *neighbor_cells);
+
 int cloud_codec_decode_config(char *input, struct cloud_data_cfg *cfg);
 
 int cloud_codec_encode_config(struct cloud_codec_data *output,

src/cloud/cloud_codec/json_common.c

@@ -560,6 +560,158 @@ int json_common_ui_data_add(cJSON *parent,
 	return err;
 }
 
+int json_common_neighbor_cells_data_add(cJSON *parent,
+					struct cloud_data_neighbor_cells *data,
+					enum json_common_op_code op)
+{
+	int err;
+
+	if (!data->queued) {
+		return -ENODATA;
+	}
+
+	err = date_time_uptime_to_unix_time_ms(&data->ts);
+	if (err) {
+		LOG_ERR("date_time_uptime_to_unix_time_ms, error: %d", err);
+		return err;
+	}
+
+	err = json_add_number(parent, DATA_NEIGHBOR_CELLS_MCC, data->cell_data.current_cell.mcc);
+	if (err) {
+		LOG_ERR("Encoding error: %d returned at %s:%d", err, __FILE__, __LINE__);
+		return err;
+	}
+
+	err = json_add_number(parent, DATA_NEIGHBOR_CELLS_MNC, data->cell_data.current_cell.mnc);
+	if (err) {
+		LOG_ERR("Encoding error: %d returned at %s:%d", err, __FILE__, __LINE__);
+		return err;
+	}
+
+	err = json_add_number(parent, DATA_NEIGHBOR_CELLS_CID, data->cell_data.current_cell.id);
+	if (err) {
+		LOG_ERR("Encoding error: %d returned at %s:%d", err, __FILE__, __LINE__);
+		return err;
+	}
+
+	err = json_add_number(parent, DATA_NEIGHBOR_CELLS_TAC, data->cell_data.current_cell.tac);
+	if (err) {
+		LOG_ERR("Encoding error: %d returned at %s:%d", err, __FILE__, __LINE__);
+		return err;
+	}
+
+	err = json_add_number(parent, DATA_NEIGHBOR_CELLS_EARFCN,
+			      data->cell_data.current_cell.earfcn);
+	if (err) {
+		LOG_ERR("Encoding error: %d returned at %s:%d", err, __FILE__, __LINE__);
+		return err;
+	}
+
+	err = json_add_number(parent, DATA_NEIGHBOR_CELLS_TIMING,
+			      data->cell_data.current_cell.timing_advance);
+	if (err) {
+		LOG_ERR("Encoding error: %d returned at %s:%d", err, __FILE__, __LINE__);
+		return err;
+	}
+
+	err = json_add_number(parent, DATA_NEIGHBOR_CELLS_RSRP,
+			      data->cell_data.current_cell.rsrp);
+	if (err) {
+		LOG_ERR("Encoding error: %d returned at %s:%d", err, __FILE__, __LINE__);
+		return err;
+	}
+
+	err = json_add_number(parent, DATA_NEIGHBOR_CELLS_RSRQ,
+			      data->cell_data.current_cell.rsrq);
+	if (err) {
+		LOG_ERR("Encoding error: %d returned at %s:%d", err, __FILE__, __LINE__);
+		return err;
+	}
+
+	err = json_add_number(parent, DATA_TIMESTAMP, data->ts);
+	if (err) {
+		LOG_ERR("Encoding error: %d returned at %s:%d", err, __FILE__, __LINE__);
+		return err;
+	}
+
+	if (data->cell_data.ncells_count > 0) {
+		cJSON *neighbor_cells = cJSON_CreateArray();
+
+		if (neighbor_cells == NULL) {
+			return err;
+		}
+
+		for (int i = 0; i < data->cell_data.ncells_count; i++) {
+
+			cJSON *cell = cJSON_CreateObject();
+
+			if (cell == NULL) {
+				err = -ENOMEM;
+				cJSON_Delete(neighbor_cells);
+				return err;
+			}
+
+			err = json_add_number(cell, DATA_NEIGHBOR_CELLS_EARFCN,
+					      data->neighbor_cells[i].earfcn);
+			if (err) {
+				LOG_ERR("Encoding error: %d returned at %s:%d", err,
+					__FILE__, __LINE__);
+				cJSON_Delete(neighbor_cells);
+				cJSON_Delete(cell);
+				return err;
+			}
+
+			err = json_add_number(cell, DATA_NEIGHBOR_CELLS_PCI,
+					      data->neighbor_cells[i].phys_cell_id);
+			if (err) {
+				LOG_ERR("Encoding error: %d returned at %s:%d", err,
+					__FILE__, __LINE__);
+				cJSON_Delete(neighbor_cells);
+				cJSON_Delete(cell);
+				return err;
+			}
+
+			err = json_add_number(cell, DATA_NEIGHBOR_CELLS_RSRP,
+					      data->neighbor_cells[i].rsrp);
+			if (err) {
+				LOG_ERR("Encoding error: %d returned at %s:%d", err,
+					__FILE__, __LINE__);
+				cJSON_Delete(neighbor_cells);
+				cJSON_Delete(cell);
+				return err;
+			}
+
+			err = json_add_number(cell, DATA_NEIGHBOR_CELLS_RSRQ,
+					      data->neighbor_cells[i].rsrq);
+			if (err) {
+				LOG_ERR("Encoding error: %d returned at %s:%d", err,
+					__FILE__, __LINE__);
+				cJSON_Delete(neighbor_cells);
+				cJSON_Delete(cell);
+				return err;
+			}
+
+			err = op_code_handle(neighbor_cells, JSON_COMMON_ADD_DATA_TO_ARRAY, NULL,
+					     cell, NULL);
+			if (err) {
+				cJSON_Delete(neighbor_cells);
+				cJSON_Delete(cell);
+				return err;
+			}
+		}
+
+		err = op_code_handle(parent, JSON_COMMON_ADD_DATA_TO_OBJECT,
+				     DATA_NEIGHBOR_CELLS_NEIGHBOR_MEAS, neighbor_cells, NULL);
+		if (err) {
+			cJSON_Delete(neighbor_cells);
+			return err;
+		}
+	}
+
+	data->queued = false;
+	return err;
+}
+
 int json_common_battery_data_add(cJSON *parent,
 				 struct cloud_data_battery *data,
 				 enum json_common_op_code op,

src/cloud/cloud_codec/json_common.h

@@ -182,6 +182,22 @@ int json_common_ui_data_add(cJSON *parent,
 			    const char *object_label,
 			    cJSON **parent_ref);
 
+/**
+ * @brief Encode and add neighbor cell data to the parent object.
+ *
+ * @param[out] parent Pointer to object that the encoded data is added to.
+ * @param[in] data Pointer to data that is to be encoded.
+ * @param[in] op Operation that is to be carried out.
+ *
+ * @retval 0 on success.
+ * @retval -ENODATA if the passed in data is not queued or has an invalid timestamp value.
+ * @retval -EINVAL if the passed in input arguments does not match whats required by the OP code.
+ * @retval -ENOMEM if the function fails to allocate memory.
+ */
+int json_common_neighbor_cells_data_add(cJSON *parent,
+					struct cloud_data_neighbor_cells *data,
+					enum json_common_op_code op);
+
 /**
  * @brief Encode and add battery data to the parent object.
  *