fix: update from upstream

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

Author: github-actions[bot]

src/modules/gnss_module.c

@@ -524,15 +524,24 @@ static int setup(void)
 /* Message handler for STATE_INIT. */
 static void on_state_init(struct gnss_msg_data *msg)
 {
-	if (IS_EVENT(msg, data, DATA_EVT_CONFIG_INIT)) {
-		gnss_timeout = msg->module.data.data.cfg.gnss_timeout;
+	if (IS_EVENT(msg, modem, MODEM_EVT_INITIALIZED)) {
+		int err;
+
+		err = setup();
+		if (err) {
+			LOG_ERR("setup, error: %d", err);
+			SEND_ERROR(gnss, GNSS_EVT_ERROR_CODE, err);
+		}
+
+		state_set(STATE_RUNNING);
 	}
 }
 
 /* Message handler for STATE_RUNNING. */
 static void on_state_running(struct gnss_msg_data *msg)
 {
-	if (IS_EVENT(msg, data, DATA_EVT_CONFIG_READY)) {
+	if ((IS_EVENT(msg, data, DATA_EVT_CONFIG_INIT)) ||
+	    (IS_EVENT(msg, data, DATA_EVT_CONFIG_READY))) {
 		gnss_timeout = msg->module.data.data.cfg.gnss_timeout;
 	}
 }
@@ -588,18 +597,6 @@ static void on_all_states(struct gnss_msg_data *msg)
 		state_set(STATE_INIT);
 	}
 
-	if (IS_EVENT(msg, modem, MODEM_EVT_INITIALIZED)) {
-		int err;
-
-		err = setup();
-		if (err) {
-			LOG_ERR("setup, error: %d", err);
-			SEND_ERROR(gnss, GNSS_EVT_ERROR_CODE, err);
-		}
-
-		state_set(STATE_RUNNING);
-	}
-
 	if (IS_EVENT(msg, util, UTIL_EVT_SHUTDOWN_REQUEST)) {
 		/* The module doesn't have anything to shut down and can
 		 * report back immediately.

src/modules/modem_module.c

@@ -491,12 +491,12 @@ static inline int adjust_rsrp(int input, enum sample_type type)
 	switch (type) {
 	case NEIGHBOR_CELL:
 		if (IS_ENABLED(CONFIG_MODEM_NEIGHBOR_CELLS_DATA_CONVERT_RSRP_TO_DBM)) {
-			return input - 140;
+			return RSRP_IDX_TO_DBM(input);
 		}
 		break;
 	case MODEM_DYNAMIC:
 		if (IS_ENABLED(CONFIG_MODEM_DYNAMIC_DATA_CONVERT_RSRP_TO_DBM)) {
-			return input - 140;
+			return RSRP_IDX_TO_DBM(input);
 		}
 		break;
 	default:
@@ -510,7 +510,7 @@ static inline int adjust_rsrp(int input, enum sample_type type)
 static inline int adjust_rsrq(int input)
 {
 	if (IS_ENABLED(CONFIG_MODEM_NEIGHBOR_CELLS_DATA_CONVERT_RSRQ_TO_DB)) {
-		return round(input * 0.5 - 19.5);
+		return round(RSRQ_IDX_TO_DB(input));
 	}
 
 	return input;