applications: asset_tracker_v2: Add new Kconfigs to convert RSRP/RSRQ

Depending on the integration, RSRP and RSRQ values need to be provided
unconverted or in dB/dBm in the various sample events sent out by
the modem module. This is due to the application using different
encoding libraries depending on the data that is sent and
the configured cloud configuration.

This patch deprecated `CONFIG_MODEM_CONVERT_RSRP_AND_RSPQ_TO_DB`

Signed-off-by: Simen S. Røstad <[email protected]>

Author: simensrostad

applications/asset_tracker_v2/src/modules/Kconfig.modem_module

@@ -29,11 +29,40 @@ config MODEM_AUTO_REQUEST_POWER_SAVING_FEATURES
 	default y
 
 config MODEM_CONVERT_RSRP_AND_RSPQ_TO_DB
-	bool "Convert RSRP and RSRQ values to dBm and dB, respectively"
-	default y if AWS_IOT || AZURE_IOT_HUB
+	bool "Convert RSRP and RSRQ values to dBm and dB, respectively [DEPRECATED]"
+	select MODEM_DYNAMIC_DATA_CONVERT_RSRP_TO_DBM
+	select MODEM_NEIGHBOR_CELLS_DATA_CONVERT_RSRP_TO_DBM
+	select MODEM_NEIGHBOR_CELLS_DATA_CONVERT_RSRQ_TO_DB
 	help
 	  If this option is enabled, RSRP and RSRQ values are converted to dBm and dB before being
-	  sent out by the module.
+	  sent out by the module. This option is deprecated,
+	  use MODEM_DYNAMIC_DATA_CONVERT_RSRP_TO_DBM, MODEM_NEIGHBOR_CELLS_DATA_CONVERT_RSRP_TO_DBM
+	  and MODEM_NEIGHBOR_CELLS_DATA_CONVERT_RSRQ_TO_DB instead.
+
+config MODEM_DYNAMIC_DATA_CONVERT_RSRP_TO_DBM
+	bool "Convert RSRP values to dBm for dynamic modem data"
+	default y
+	help
+	  If this option is enabled, RSRP values are converted to dBm before being
+	  sent out by the module with the MODEM_EVT_MODEM_DYNAMIC_DATA_READY event.
+
+config MODEM_NEIGHBOR_CELLS_DATA_CONVERT_RSRP_TO_DBM
+	bool "Convert RSRP values to dBm for neighbor cell measurements"
+	default y if AWS_IOT || AZURE_IOT_HUB
+	help
+	  If this option is enabled, RSRP values are converted to dBm before being
+	  sent out by the module with the MODEM_EVT_NEIGHBOR_CELLS_DATA_READY event.
+	  Don't convert RSRP to dBm when building for nRF Cloud, this is handled during encoding
+	  using the nRF Cloud cellular positioning library.
+
+config MODEM_NEIGHBOR_CELLS_DATA_CONVERT_RSRQ_TO_DB
+	bool "Convert RSRQ values to dB for neighbor cell measurements"
+	default y if AWS_IOT || AZURE_IOT_HUB
+	help
+	  If this option is enabled, RSRQ values are converted to dB before being
+	  sent out by the module with the MODEM_EVT_NEIGHBOR_CELLS_DATA_READY event.
+	  Don't convert RSRQ to dB when building for nRF Cloud, this is handled during encoding
+	  using the nRF Cloud cellular positioning library.
 
 endif # MODEM_MODULE
 

applications/asset_tracker_v2/src/modules/modem_module.c

@@ -61,6 +61,14 @@ static enum state_type {
 	STATE_SHUTDOWN,
 } state;
 
+/* Enumerator that specifies the data type that is sampled. */
+enum sample_type {
+	NEIGHBOR_CELL,
+	MODEM_DYNAMIC,
+	MODEM_STATIC,
+	BATTERY_VOLTAGE
+};
+
 /* Struct that holds data from the modem information module. */
 static struct modem_param_info modem_param;
 
@@ -90,7 +98,7 @@ static void send_cell_update(uint32_t cell_id, uint32_t tac);
 static void send_neighbor_cell_update(struct lte_lc_cells_info *cell_info);
 static void send_psm_update(int tau, int active_time);
 static void send_edrx_update(float edrx, float ptw);
-static inline int adjust_rsrp(int input);
+static inline int adjust_rsrp(int input, enum sample_type type);
 static inline int adjust_rsrq(int input);
 
 /* Convenience functions used in internal state handling. */
@@ -256,7 +264,7 @@ static void modem_rsrp_handler(char rsrp_value)
 	 * This temporarily saves the latest value which are sent to
 	 * the Data module upon a modem data request.
 	 */
-	rsrp_value_latest = adjust_rsrp(rsrp_value);
+	rsrp_value_latest = adjust_rsrp(rsrp_value, MODEM_DYNAMIC);
 
 	LOG_DBG("Incoming RSRP status message, RSRP value is %d",
 		rsrp_value_latest);
@@ -431,18 +439,30 @@ static void send_edrx_update(float edrx, float ptw)
 	EVENT_SUBMIT(evt);
 }
 
-static inline int adjust_rsrp(int input)
+static inline int adjust_rsrp(int input, enum sample_type type)
 {
-	if (IS_ENABLED(CONFIG_MODEM_CONVERT_RSRP_AND_RSPQ_TO_DB)) {
-		return input - 140;
+	switch (type) {
+	case NEIGHBOR_CELL:
+		if (IS_ENABLED(CONFIG_MODEM_NEIGHBOR_CELLS_DATA_CONVERT_RSRP_TO_DBM)) {
+			return input - 140;
+		}
+		break;
+	case MODEM_DYNAMIC:
+		if (IS_ENABLED(CONFIG_MODEM_DYNAMIC_DATA_CONVERT_RSRP_TO_DBM)) {
+			return input - 140;
+		}
+		break;
+	default:
+		LOG_WRN("Unknown sample type");
+		break;
 	}
 
 	return input;
 }
 
 static inline int adjust_rsrq(int input)
 {
-	if (IS_ENABLED(CONFIG_MODEM_CONVERT_RSRP_AND_RSPQ_TO_DB)) {
+	if (IS_ENABLED(CONFIG_MODEM_NEIGHBOR_CELLS_DATA_CONVERT_RSRQ_TO_DB)) {
 		return round(input * 0.5 - 19.5);
 	}
 
@@ -464,13 +484,15 @@ static void send_neighbor_cell_update(struct lte_lc_cells_info *cell_info)
 
 	/* Convert RSRP to dBm and RSRQ to dB per "nRF91 AT Commands" v1.7. */
 	evt->data.neighbor_cells.cell_data.current_cell.rsrp =
-			adjust_rsrp(evt->data.neighbor_cells.cell_data.current_cell.rsrp);
+			adjust_rsrp(evt->data.neighbor_cells.cell_data.current_cell.rsrp,
+				    NEIGHBOR_CELL);
 	evt->data.neighbor_cells.cell_data.current_cell.rsrq =
 			adjust_rsrq(evt->data.neighbor_cells.cell_data.current_cell.rsrq);
 
 	for (size_t i = 0; i < evt->data.neighbor_cells.cell_data.ncells_count; i++) {
 		evt->data.neighbor_cells.neighbor_cells[i].rsrp =
-			adjust_rsrp(evt->data.neighbor_cells.neighbor_cells[i].rsrp);
+			adjust_rsrp(evt->data.neighbor_cells.neighbor_cells[i].rsrp,
+				    NEIGHBOR_CELL);
 		evt->data.neighbor_cells.neighbor_cells[i].rsrq =
 			adjust_rsrq(evt->data.neighbor_cells.neighbor_cells[i].rsrq);
 	}