applications: asset_tracker_v2: Unify data type checks

The checks for requested data types are unified into one common
function to avoid code repetition and ease maintanance.

Signed-off-by: Jan Tore Guggedal <[email protected]>

Author: jtguggedal

applications/asset_tracker_v2/src/modules/modem_module.c

@@ -689,47 +689,12 @@ static int dynamic_modem_data_get(void)
 	return 0;
 }
 
-static bool static_modem_data_requested(enum app_module_data_type *data_list,
-					size_t count)
+static bool data_type_is_requested(enum app_module_data_type *data_list,
+				   size_t count,
+				   enum app_module_data_type type)
 {
 	for (size_t i = 0; i < count; i++) {
-		if (data_list[i] == APP_DATA_MODEM_STATIC) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
-static bool dynamic_modem_data_requested(enum app_module_data_type *data_list,
-					 size_t count)
-{
-	for (size_t i = 0; i < count; i++) {
-		if (data_list[i] == APP_DATA_MODEM_DYNAMIC) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
-static bool battery_data_requested(enum app_module_data_type *data_list,
-				   size_t count)
-{
-	for (size_t i = 0; i < count; i++) {
-		if (data_list[i] == APP_DATA_BATTERY) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
-static bool neighbor_cells_data_requested(enum app_module_data_type *data_list,
-				     size_t count)
-{
-	for (size_t i = 0; i < count; i++) {
-		if (data_list[i] == APP_DATA_NEIGHBOR_CELLS) {
+		if (data_list[i] == type) {
 			return true;
 		}
 	}
@@ -939,8 +904,9 @@ static void on_all_states(struct modem_msg_data *msg)
 	}
 
 	if (IS_EVENT(msg, app, APP_EVT_DATA_GET)) {
-		if (static_modem_data_requested(msg->module.app.data_list,
-						msg->module.app.count)) {
+		if (data_type_is_requested(msg->module.app.data_list,
+					   msg->module.app.count,
+					   APP_DATA_MODEM_STATIC)) {
 
 			int err;
 
@@ -951,8 +917,9 @@ static void on_all_states(struct modem_msg_data *msg)
 			}
 		}
 
-		if (dynamic_modem_data_requested(msg->module.app.data_list,
-						 msg->module.app.count)) {
+		if (data_type_is_requested(msg->module.app.data_list,
+					   msg->module.app.count,
+					   APP_DATA_MODEM_DYNAMIC)) {
 
 			int err;
 
@@ -963,8 +930,9 @@ static void on_all_states(struct modem_msg_data *msg)
 			}
 		}
 
-		if (battery_data_requested(msg->module.app.data_list,
-					   msg->module.app.count)) {
+		if (data_type_is_requested(msg->module.app.data_list,
+					   msg->module.app.count,
+					   APP_DATA_BATTERY)) {
 
 			int err;
 
@@ -975,8 +943,9 @@ static void on_all_states(struct modem_msg_data *msg)
 			}
 		}
 
-		if (neighbor_cells_data_requested(msg->module.app.data_list,
-						  msg->module.app.count)) {
+		if (data_type_is_requested(msg->module.app.data_list,
+					   msg->module.app.count,
+					   APP_DATA_NEIGHBOR_CELLS)) {
 			int err;
 
 			err = neighbor_cells_measurement_start();