modules: cloud: Move environmental data handling to new file

Move the environemntal data handling to a separate file
that is only included if CONFIG_APP_ENVIRONMENTAL is enabled.

Signed-off-by: Jan Tore Guggedal <jantore.guggedal@nordicsemi.no>

Author: jtguggedal

app/src/modules/cloud/CMakeLists.txt

@@ -7,6 +7,7 @@
 target_sources(app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/cloud.c)
 target_sources(app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/cloud_provisioning.c)
 target_sources_ifdef(CONFIG_APP_LOCATION app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/cloud_location.c)
+target_sources_ifdef(CONFIG_APP_ENVIRONMENTAL app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/cloud_environmental.c)
 target_sources_ifdef(CONFIG_APP_CLOUD_SHELL app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/cloud_shell.c)
 target_include_directories(app PRIVATE .)
 

app/src/modules/cloud/cloud.c

@@ -27,6 +27,7 @@
 #include "cloud_internal.h"
 #include "cloud_provisioning.h"
 #include "cloud_location.h"
+#include "cloud_environmental.h"
 #include "app_common.h"
 #include "network.h"
 #include "storage.h"
@@ -339,7 +340,6 @@ static void send_request_failed(void)
 	}
 }
 
-
 #if defined(CONFIG_APP_NETWORK)
 static void handle_network_data_message(const struct network_msg *msg)
 {
@@ -413,37 +413,7 @@ static int send_storage_data_to_cloud(const struct storage_data_item *item)
 	if (item->type == STORAGE_TYPE_ENVIRONMENTAL) {
 		const struct environmental_msg *env = &item->data.ENVIRONMENTAL;
 
-		err = nrf_cloud_coap_sensor_send(NRF_CLOUD_JSON_APPID_VAL_TEMP,
-						 env->temperature,
-						 timestamp_ms,
-						 confirmable);
-		if (err) {
-			LOG_ERR("Failed to send temperature data to cloud, error: %d", err);
-			return err;
-		}
-
-		err = nrf_cloud_coap_sensor_send(NRF_CLOUD_JSON_APPID_VAL_AIR_PRESS,
-						 env->pressure,
-						 timestamp_ms,
-						 confirmable);
-		if (err) {
-			LOG_ERR("Failed to send pressure data to cloud, error: %d", err);
-			return err;
-		}
-
-		err = nrf_cloud_coap_sensor_send(NRF_CLOUD_JSON_APPID_VAL_HUMID,
-						 env->humidity,
-						 timestamp_ms,
-						 confirmable);
-		if (err) {
-			LOG_ERR("Failed to send humidity data to cloud, error: %d", err);
-			return err;
-		}
-
-		LOG_DBG("Environmental data sent to cloud: T=%.1f°C, P=%.1fhPa, H=%.1f%%",
-			(double)env->temperature, (double)env->pressure, (double)env->humidity);
-
-		return 0;
+		return cloud_environmental_send(env, timestamp_ms, confirmable);
 	}
 #endif /* CONFIG_APP_ENVIRONMENTAL */
 

app/src/modules/cloud/cloud_environmental.c

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <net/nrf_cloud_coap.h>
+
+#include "cloud_environmental.h"
+
+LOG_MODULE_DECLARE(cloud, CONFIG_APP_CLOUD_LOG_LEVEL);
+
+int cloud_environmental_send(const struct environmental_msg *env,
+			     int64_t timestamp_ms,
+			     bool confirmable)
+{
+	int err;
+
+	err = nrf_cloud_coap_sensor_send(NRF_CLOUD_JSON_APPID_VAL_TEMP,
+					 env->temperature,
+					 timestamp_ms,
+					 confirmable);
+	if (err) {
+		LOG_ERR("Failed to send temperature data to cloud, error: %d", err);
+		return err;
+	}
+
+	err = nrf_cloud_coap_sensor_send(NRF_CLOUD_JSON_APPID_VAL_AIR_PRESS,
+					 env->pressure,
+					 timestamp_ms,
+					 confirmable);
+	if (err) {
+		LOG_ERR("Failed to send pressure data to cloud, error: %d", err);
+		return err;
+	}
+
+	err = nrf_cloud_coap_sensor_send(NRF_CLOUD_JSON_APPID_VAL_HUMID,
+					 env->humidity,
+					 timestamp_ms,
+					 confirmable);
+	if (err) {
+		LOG_ERR("Failed to send humidity data to cloud, error: %d", err);
+		return err;
+	}
+
+	LOG_DBG("Environmental data sent to cloud: T=%.1f°C, P=%.1fhPa, H=%.1f%%",
+		(double)env->temperature, (double)env->pressure, (double)env->humidity);
+
+	return 0;
+}

app/src/modules/cloud/cloud_environmental.h

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#ifndef _CLOUD_ENVIRONMENTAL_H_
+#define _CLOUD_ENVIRONMENTAL_H_
+
+#include <stdint.h>
+#include "environmental.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Send environmental data to the cloud.
+ *
+ * Sends temperature, pressure, and humidity data to nRF Cloud.
+ *
+ * @param env Pointer to environmental message containing sensor data
+ * @param timestamp_ms Timestamp in milliseconds, or NRF_CLOUD_NO_TIMESTAMP
+ * @param confirmable Whether to use confirmable CoAP messages
+ *
+ * @return 0 on success, negative error code on failure
+ */
+int cloud_environmental_send(const struct environmental_msg *env,
+			     int64_t timestamp_ms,
+			     bool confirmable);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _CLOUD_ENVIRONMENTAL_H_ */

tests/module/cloud/CMakeLists.txt

@@ -17,6 +17,7 @@ target_sources(app
   ../../../app/src/modules/cloud/cloud.c
   ../../../app/src/modules/cloud/cloud_provisioning.c
   ../../../app/src/modules/cloud/cloud_location.c
+  ../../../app/src/modules/cloud/cloud_environmental.c
 )
 
 zephyr_include_directories(${ZEPHYR_BASE}/include/zephyr/)