environmental: add multi-sensor support and extended data reporting

nmpluta · nmpluta · commit c1c66752ea3d · 2025-09-14T13:05:04.000+02:00
- Add device tree and driver configuration for BME280, CCS811, HM330X, and SEN0466 sensors on I2C2 bus. - Update environmental module to sample and report temperature, pressure, humidity, CO2, VOC, PM1.0, PM2.5, PM10, CO, and secondary temperature. - Extend environmental_msg struct and logging to include new sensor data fields. - Update Kconfig and prj.conf to enable new sensor drivers and logging. - Refactor environmental state object to hold multiple sensor device pointers. - Update cloud module to forward all new environmental data fields to nRF Cloud. Refs: #25 Signed-off-by: Natalia Pluta <pluta.natalia.m@gmail.com>
diff --git a/app_2/boards/nrf9160dk_nrf9160_ns.overlay b/app_2/boards/nrf9160dk_nrf9160_ns.overlay
@@ -1,5 +1,55 @@
 /*
- * Copyright (c) 2025 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ * Copyright (c) 2025 Natalia Pluta
+ * SPDX-License-Identifier: Apache-2.0
  */
+
+&pinctrl {
+	i2c2_default_alt: i2c2_default_alt {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 0, 30)>,
+					<NRF_PSEL(TWIM_SCL, 0, 31)>;
+		};
+	};
+
+	i2c2_sleep_alt: i2c2_sleep_alt {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 0, 30)>,
+					<NRF_PSEL(TWIM_SCL, 0, 31)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c2 {
+	status = "okay";
+	pinctrl-0 = <&i2c2_default_alt>;
+	pinctrl-1 = <&i2c2_sleep_alt>;
+	pinctrl-names = "default", "sleep";
+	
+	bme280: bme280@77 {
+		compatible = "bosch,bme280";
+		reg = <0x77>;
+		status = "okay";
+	};
+	
+	ccs811: ccs811@5b {
+		compatible = "ams,ccs811";
+		reg = <0x5b>;
+		status = "okay";
+		reset-gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
+		irq-gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
+		wake-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
+	};
+	
+	hm3301: hm3301@40 {
+		compatible = "seeed,hm330x";
+		reg = <0x40>;
+		status = "okay";
+	};
+
+	sen0466: sen0466@74 {
+		compatible = "dfrobot,sen0466";
+		reg = <0x74>;
+		status = "okay";
+	};
+};
diff --git a/app_2/prj.conf b/app_2/prj.conf
@@ -12,6 +12,15 @@ CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1280
 CONFIG_DK_LIBRARY=y
 CONFIG_ZVFS_OPEN_MAX=10
 
+# Enable I2C and sensor subsystem for multiple sensors
+CONFIG_SENSOR=y
+CONFIG_I2C=y
+CONFIG_BME280=y
+CONFIG_CCS811=y
+# CONFIG_CCS811_ENV_COMPENSATION=y
+CONFIG_HM330X=y
+CONFIG_SEN0466=y
+
 # TFM logging over uart0
 CONFIG_TFM_LOG_LEVEL_SILENCE=n
 CONFIG_TFM_SECURE_UART0=y
@@ -188,6 +197,7 @@ CONFIG_APP_LOCATION_LOG_LEVEL_DBG=y
 CONFIG_APP_CLOUD_LOG_LEVEL_DBG=y
 CONFIG_APP_NETWORK_LOG_LEVEL_DBG=y
 CONFIG_APP_LOG_LEVEL_DBG=y
+CONFIG_APP_ENVIRONMENTAL_LOG_LEVEL_DBG=y
 
 # Task Watchdog
 CONFIG_TASK_WDT=y
diff --git a/app_2/src/modules/cloud/cloud.c b/app_2/src/modules/cloud/cloud.c
@@ -41,6 +41,12 @@ LOG_MODULE_REGISTER(cloud, CONFIG_APP_CLOUD_LOG_LEVEL);
 
 #define CUSTOM_JSON_APPID_VAL_CONEVAL "CONEVAL"
 #define CUSTOM_JSON_APPID_VAL_BATTERY "BATTERY"
+#define CUSTOM_JSON_APPID_VAL_CO2     "CO2"
+#define CUSTOM_JSON_APPID_VAL_VOC     "VOC"
+#define CUSTOM_JSON_APPID_VAL_PM1_0   "PM1_0"
+#define CUSTOM_JSON_APPID_VAL_PM2_5   "PM2_5"
+#define CUSTOM_JSON_APPID_VAL_PM10    "PM10"
+#define CUSTOM_JSON_APPID_VAL_CO      "CO"
 
 #define AGNSS_MAX_DATA_SIZE 3800
 
@@ -86,7 +92,7 @@ enum priv_cloud_msg {
 
 /* Create private cloud channel for internal messaging that is not intended for external use.
  * The channel is needed to communicate from asynchronous callbacks to the state machine and
- * ensure state transitions only happen from the cloud  module thread where the state machine
+ * ensure state transitions only happen from the cloud module thread where the state machine
  * is running.
  */
 ZBUS_CHAN_DEFINE(PRIV_CLOUD_CHAN, enum priv_cloud_msg, NULL, NULL, ZBUS_OBSERVERS(cloud_subscriber),
@@ -789,6 +795,54 @@ static void state_connected_ready_run(void *obj)
 				return;
 			}
 
+			err = nrf_cloud_coap_sensor_send(CUSTOM_JSON_APPID_VAL_CO2, msg.co2,
+							 msg.timestamp, confirmable);
+			if (err) {
+				LOG_ERR("nrf_cloud_coap_sensor_send (CO2), error: %d", err);
+				send_request_failed();
+				return;
+			}
+
+			err = nrf_cloud_coap_sensor_send(CUSTOM_JSON_APPID_VAL_VOC, msg.voc,
+							 msg.timestamp, confirmable);
+			if (err) {
+				LOG_ERR("nrf_cloud_coap_sensor_send (VOC), error: %d", err);
+				send_request_failed();
+				return;
+			}
+
+			err = nrf_cloud_coap_sensor_send(CUSTOM_JSON_APPID_VAL_PM1_0, msg.pm1_0,
+							 msg.timestamp, confirmable);
+			if (err) {
+				LOG_ERR("nrf_cloud_coap_sensor_send (PM1_0), error: %d", err);
+				send_request_failed();
+				return;
+			}
+
+			err = nrf_cloud_coap_sensor_send(CUSTOM_JSON_APPID_VAL_PM2_5, msg.pm2_5,
+							 msg.timestamp, confirmable);
+			if (err) {
+				LOG_ERR("nrf_cloud_coap_sensor_send (PM2_5), error: %d", err);
+				send_request_failed();
+				return;
+			}
+
+			err = nrf_cloud_coap_sensor_send(CUSTOM_JSON_APPID_VAL_PM10, msg.pm10,
+							 msg.timestamp, confirmable);
+			if (err) {
+				LOG_ERR("nrf_cloud_coap_sensor_send (PM10), error: %d", err);
+				send_request_failed();
+				return;
+			}
+
+			err = nrf_cloud_coap_sensor_send(CUSTOM_JSON_APPID_VAL_CO, msg.co,
+							 msg.timestamp, confirmable);
+			if (err) {
+				LOG_ERR("nrf_cloud_coap_sensor_send (CO), error: %d", err);
+				send_request_failed();
+				return;
+			}
+
 			return;
 		}
 
diff --git a/app_2/src/modules/environmental/Kconfig.environmental b/app_2/src/modules/environmental/Kconfig.environmental
@@ -6,7 +6,7 @@
 
 menuconfig APP_ENVIRONMENTAL
 	bool "Environmental module"
-	depends on BME680
+	depends on BME280
 	default y
 
 if APP_ENVIRONMENTAL
diff --git a/app_2/src/modules/environmental/environmental.c b/app_2/src/modules/environmental/environmental.c
@@ -8,6 +8,7 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/zbus/zbus.h>
 #include <zephyr/drivers/sensor.h>
+#include <zephyr/drivers/sensor/sen0466.h>
 #include <zephyr/task_wdt/task_wdt.h>
 #include <zephyr/smf.h>
 
@@ -59,13 +60,23 @@ struct environmental_state_object {
 	/* Buffer for last zbus message */
 	uint8_t msg_buf[MAX_MSG_SIZE];
 
-	/* Pointer to the BME680 sensor device */
-	const struct device *const bme680;
+	/* Pointer to the sensors devices */
+	const struct device *const bme280;
+	const struct device *const ccs811;
+	const struct device *const hm330x;
+	const struct device *const sen0466;
 
 	/* Sensor values */
 	double temperature;
 	double pressure;
 	double humidity;
+	double co2;
+	double voc;
+	double pm1_0;
+	double pm2_5;
+	double pm10;
+	double co;
+	double temperature_sen0466;
 };
 
 /* Forward declarations of state handlers */
@@ -76,46 +87,118 @@ static const struct smf_state states[] = {
 	[STATE_RUNNING] = SMF_CREATE_STATE(NULL, state_running_run, NULL, NULL, NULL),
 };
 
-static void sample_sensors(const struct device *const bme680)
+static void sample_sensors(const struct environmental_state_object *state)
 {
 	int err;
-	struct sensor_value temp = {0};
-	struct sensor_value press = {0};
-	struct sensor_value humidity = {0};
-
-	err = sensor_sample_fetch(bme680);
-	if (err) {
-		LOG_ERR("sensor_sample_fetch, error: %d", err);
-		SEND_FATAL_ERROR();
-		return;
+	struct sensor_value temp = {0}, press = {0}, humidity = {0};
+	struct sensor_value co2 = {0}, voc = {0};
+	struct sensor_value pm1_0 = {0}, pm2_5 = {0}, pm10 = {0};
+	struct sensor_value co = {0}, temp_sen0466 = {0};
+
+	// BME280
+	if (state->bme280) {
+		err = sensor_sample_fetch(state->bme280);
+		if (err) {
+			LOG_ERR("BME280: sensor_sample_fetch, error: %d", err);
+			SEND_FATAL_ERROR();
+			return;
+		}
+		err = sensor_channel_get(state->bme280, SENSOR_CHAN_AMBIENT_TEMP, &temp);
+		if (err) {
+			LOG_WRN("BME280: temp read failed: %d", err);
+		}
+		err = sensor_channel_get(state->bme280, SENSOR_CHAN_PRESS, &press);
+		if (err) {
+			LOG_WRN("BME280: press read failed: %d", err);
+		}
+		err = sensor_channel_get(state->bme280, SENSOR_CHAN_HUMIDITY, &humidity);
+		if (err) {
+			LOG_WRN("BME280: humidity read failed: %d", err);
+		}
 	}
 
-	err = sensor_channel_get(bme680, SENSOR_CHAN_AMBIENT_TEMP, &temp);
-	if (err) {
-		LOG_ERR("sensor_channel_get, error: %d", err);
-		SEND_FATAL_ERROR();
-		return;
+	// CCS811
+	if (state->ccs811) {
+		err = sensor_sample_fetch(state->ccs811);
+		if (err) {
+			LOG_WRN("CCS811: sensor_sample_fetch, error: %d", err);
+		} else {
+			err = sensor_channel_get(state->ccs811, SENSOR_CHAN_CO2, &co2);
+			if (err) {
+				LOG_WRN("CCS811: CO2 read failed: %d", err);
+			}
+			err = sensor_channel_get(state->ccs811, SENSOR_CHAN_VOC, &voc);
+			if (err) {
+				LOG_WRN("CCS811: VOC read failed: %d", err);
+			}
+		}
 	}
 
-	err = sensor_channel_get(bme680, SENSOR_CHAN_PRESS, &press);
-	if (err) {
-		LOG_ERR("sensor_channel_get, error: %d", err);
-		SEND_FATAL_ERROR();
-		return;
+	// HM330X
+	if (state->hm330x) {
+		err = sensor_sample_fetch(state->hm330x);
+		if (err) {
+			LOG_WRN("HM330X: sensor_sample_fetch, error: %d", err);
+		} else {
+			err = sensor_channel_get(state->hm330x, SENSOR_CHAN_PM_1_0, &pm1_0);
+			if (err) {
+				LOG_WRN("HM330X: PM1.0 read failed: %d", err);
+			}
+			err = sensor_channel_get(state->hm330x, SENSOR_CHAN_PM_2_5, &pm2_5);
+			if (err) {
+				LOG_WRN("HM330X: PM2.5 read failed: %d", err);
+			}
+			err = sensor_channel_get(state->hm330x, SENSOR_CHAN_PM_10, &pm10);
+			if (err) {
+				LOG_WRN("HM330X: PM10 read failed: %d", err);
+			}
+		}
 	}
 
-	err = sensor_channel_get(bme680, SENSOR_CHAN_HUMIDITY, &humidity);
-	if (err) {
-		LOG_ERR("sensor_channel_get, error: %d", err);
-		SEND_FATAL_ERROR();
-		return;
+	// SEN0466
+	if (state->sen0466) {
+		err = sensor_sample_fetch(state->sen0466);
+		if (err) {
+			LOG_WRN("SEN0466: sensor_sample_fetch, error: %d", err);
+		} else {
+			err = sensor_channel_get(state->sen0466, SENSOR_CHAN_SEN0466_CO, &co);
+			if (err) {
+				LOG_WRN("SEN0466: CO read failed: %d", err);
+			}
+			err = sensor_channel_get(state->sen0466, SENSOR_CHAN_SEN0466_TEMP,
+						 &temp_sen0466);
+			if (err) {
+				LOG_WRN("SEN0466: temp read failed: %d", err);
+			}
+		}
 	}
 
+	// Transform and store in state object fields
+	((struct environmental_state_object *)state)->temperature = sensor_value_to_double(&temp);
+	((struct environmental_state_object *)state)->pressure = sensor_value_to_double(&press);
+	((struct environmental_state_object *)state)->humidity = sensor_value_to_double(&humidity);
+	((struct environmental_state_object *)state)->co2 = sensor_value_to_double(&co2);
+	((struct environmental_state_object *)state)->voc = sensor_value_to_double(&voc);
+	((struct environmental_state_object *)state)->pm1_0 = sensor_value_to_double(&pm1_0);
+	((struct environmental_state_object *)state)->pm2_5 = sensor_value_to_double(&pm2_5);
+	((struct environmental_state_object *)state)->pm10 = sensor_value_to_double(&pm10);
+	((struct environmental_state_object *)state)->co = sensor_value_to_double(&co);
+	((struct environmental_state_object *)state)->temperature_sen0466 =
+		sensor_value_to_double(&temp_sen0466);
+
 	struct environmental_msg msg = {
 		.type = ENVIRONMENTAL_SENSOR_SAMPLE_RESPONSE,
-		.temperature = sensor_value_to_double(&temp),
-		.pressure = sensor_value_to_double(&press),
-		.humidity = sensor_value_to_double(&humidity),
+		.temperature = ((struct environmental_state_object *)state)->temperature,
+		.pressure = ((struct environmental_state_object *)state)->pressure,
+		.humidity = ((struct environmental_state_object *)state)->humidity,
+		.co2 = ((struct environmental_state_object *)state)->co2,
+		.voc = ((struct environmental_state_object *)state)->voc,
+		.pm1_0 = ((struct environmental_state_object *)state)->pm1_0,
+		.pm2_5 = ((struct environmental_state_object *)state)->pm2_5,
+		.pm10 = ((struct environmental_state_object *)state)->pm10,
+		.co = ((struct environmental_state_object *)state)->co,
+		.temperature_sen0466 =
+			((struct environmental_state_object *)state)->temperature_sen0466,
 	};
 
 #if defined(CONFIG_APP_ENVIRONMENTAL_TIMESTAMP)
@@ -125,9 +208,15 @@ static void sample_sensors(const struct device *const bme680)
 	}
 #endif /* CONFIG_APP_ENVIRONMENTAL_TIMESTAMP */
 
-	/* Log the environmental values and limit to 2 decimals */
-	LOG_DBG("Temperature: %.2f C, Pressure: %.2f Pa, Humidity: %.2f %%", msg.temperature,
-		msg.pressure, msg.humidity);
+	LOG_DBG("Sampled: T:%.2fC P:%.2fPa H:%.2f%% CO2:%.2f VOC:%.2f PM1.0:%.2f PM2.5:%.2f "
+		"PM10:%.2f CO:%.2f T2:%.2fC",
+		msg.temperature, msg.pressure, msg.humidity, msg.co2, msg.voc, msg.pm1_0, msg.pm2_5,
+		msg.pm10, msg.co, msg.temperature_sen0466);
+
+	LOG_INF("BME280: T:%.2fC P:%.2fkPa H:%.2f%%", msg.temperature, msg.pressure, msg.humidity);
+	LOG_INF("CCS811: CO2:%.2f VOC:%.2f", msg.co2, msg.voc);
+	LOG_INF("HM330X: PM1.0:%.2f PM2.5:%.2f PM10:%.2f", msg.pm1_0, msg.pm2_5, msg.pm10);
+	LOG_INF("SEN0466: CO:%.2f T2:%.2fC", msg.co, msg.temperature_sen0466);
 
 	err = zbus_chan_pub(&ENVIRONMENTAL_CHAN, &msg, K_NO_WAIT);
 	if (err) {
@@ -156,7 +245,7 @@ static void state_running_run(void *obj)
 
 		if (msg.type == ENVIRONMENTAL_SENSOR_SAMPLE_REQUEST) {
 			LOG_DBG("Environmental values sample request received, getting data");
-			sample_sensors(state_object->bme680);
+			sample_sensors(state_object);
 		}
 	}
 }
@@ -171,7 +260,10 @@ static void env_module_thread(void)
 		(CONFIG_APP_ENVIRONMENTAL_MSG_PROCESSING_TIMEOUT_SECONDS * MSEC_PER_SEC);
 	const k_timeout_t zbus_wait_ms = K_MSEC(wdt_timeout_ms - execution_time_ms);
 	struct environmental_state_object environmental_state = {
-		.bme680 = DEVICE_DT_GET(DT_NODELABEL(bme680)),
+		.bme280 = DEVICE_DT_GET(DT_NODELABEL(bme280)),
+		.ccs811 = DEVICE_DT_GET_OR_NULL(DT_NODELABEL(ccs811)),
+		.hm330x = DEVICE_DT_GET_OR_NULL(DT_NODELABEL(hm330x)),
+		.sen0466 = DEVICE_DT_GET_OR_NULL(DT_NODELABEL(sen0466)),
 	};
 
 	LOG_DBG("Environmental module task started");
diff --git a/app_2/src/modules/environmental/environmental.h b/app_2/src/modules/environmental/environmental.h
