modules: environmental: Cleanup

Cleanup, update manifest to fix bug.

Signed-off-by: Simen S. Røstad <simen.rostad@nordicsemi.no>

Author: simensrostad

app/boards/thingy91x_nrf9151_ns.conf

@@ -4,7 +4,4 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-CONFIG_BME680=n
-CONFIG_BME68X_IAQ=y
-CONFIG_BME68X_IAQ_THREAD_STACK_SIZE=2048
-CONFIG_BME68X_IAQ_SAMPLE_RATE_ULTRA_LOW_POWER=y
+CONFIG_BME680=y

app/boards/thingy91x_nrf9151_ns.overlay

@@ -11,10 +11,6 @@
 };
 
 / {
-	aliases {
-		gas-sensor = &bme680;
-	};
-
 	chosen {
 		nordic,modem-trace-uart = &uart1;
 		zephyr,wifi = &nordic_wlan0;

app/prj.conf

@@ -13,9 +13,6 @@ CONFIG_DK_LIBRARY=y
 CONFIG_ZVFS_OPEN_MAX=10
 CONFIG_PWM=y
 
-# Disable UART NRFX legacy shim to make the device boot.
-CONFIG_UART_NRFX_UARTE_LEGACY_SHIM=n
-
 # Heap and stacks
 CONFIG_MAIN_STACK_SIZE=4096
 # Extended AT host/monitor stack/heap sizes since some nrf_cloud credentials are longer than 1024 bytes.
@@ -122,7 +119,6 @@ CONFIG_FOTA_DOWNLOAD=y
 CONFIG_FOTA_DOWNLOAD_PROGRESS_EVT=y
 CONFIG_FOTA_DL_TIMEOUT_MIN=30
 CONFIG_DFU_TARGET=y
-CONFIG_BUILD_S1_VARIANT=y
 # COAP client
 CONFIG_COAP_CLIENT_THREAD_PRIORITY=0
 CONFIG_COAP_CLIENT_BLOCK_SIZE=1024
@@ -163,6 +159,7 @@ CONFIG_LTE_NETWORK_MODE_LTE_M_NBIOT_GPS=y
 CONFIG_WIFI=y
 CONFIG_WIFI_NRF70=y
 CONFIG_WIFI_NRF70_SKIP_LOCAL_ADMIN_MAC=y
+CONFIG_WIFI_NRF70_LOG_LEVEL_ERR=y
 CONFIG_NRF70_BH_WQ_STACK_SIZE=1024
 CONFIG_NRF70_IRQ_WQ_STACK_SIZE=1024
 

app/src/common/message_channel.c

@@ -18,6 +18,14 @@ ZBUS_CHAN_DEFINE(TRIGGER_CHAN,
 		 ZBUS_MSG_INIT(0)
 );
 
+ZBUS_CHAN_DEFINE(ENVIRONMENTAL_CHAN,
+		 struct environmental_msg,
+		 NULL,
+		 NULL,
+		 ZBUS_OBSERVERS_EMPTY,
+		 ZBUS_MSG_INIT(0)
+);
+
 ZBUS_CHAN_DEFINE(ERROR_CHAN,
 		 enum error_type,
 		 NULL,

app/src/common/message_channel.h

@@ -48,6 +48,39 @@ extern "C" {
 	k_sleep(K_SECONDS(10));							\
 } while (0)
 
+/** ENVIRONMENTAL MODULE */
+
+enum environmental_msg_type {
+	/* Output message types */
+
+	/* Response message to a request for current environmental sensor values.
+	 * The sampled values are found in the respective fields of the message structure.
+	 */
+	ENVIRONMENTAL_SENSOR_SAMPLE_RESPONSE = 0x1,
+
+	/* Input message types */
+
+	/* Request to sample the current environmental sensor values.
+	 * The response is sent as a ENVIRONMENTAL_SENSOR_SAMPLE_RESPONSE message.
+	 */
+	ENVIRONMENTAL_SENSOR_SAMPLE_REQUEST,
+};
+
+struct environmental_msg {
+	enum environmental_msg_type type;
+
+	/** Contains the current temperature in celsius. */
+	double temperature;
+
+	/** Contains the current humidity in percentage. */
+	double humidity;
+
+	/** Contains the current pressure in Pa. */
+	double pressure;
+};
+
+#define MSG_TO_ENVIRONMENTAL_MSG(_msg)	(*(const struct environmental_msg *)_msg)
+
 enum trigger_type {
 	TRIGGER_POLL_SHADOW = 0x1,
 	TRIGGER_FOTA_POLL,
@@ -91,6 +124,7 @@ ZBUS_CHAN_DECLARE(
 	CONFIG_CHAN,
 	ERROR_CHAN,
 	TIME_CHAN,
+	ENVIRONMENTAL_CHAN,
 	TRIGGER_CHAN
 );
 

app/src/modules/app/app.c

@@ -120,6 +120,9 @@ static void triggers_send(void)
 	struct battery_msg battery_msg = {
 		.type = BATTERY_PERCENTAGE_SAMPLE_REQUEST,
 	};
+	struct battery_msg environmental_msg = {
+		.type = ENVIRONMENTAL_SENSOR_SAMPLE_REQUEST,
+	};
 	enum trigger_type poll_trigger = TRIGGER_FOTA_POLL;
 
 	err = zbus_chan_pub(&NETWORK_CHAN, &network_msg, K_SECONDS(1));
@@ -136,6 +139,13 @@ static void triggers_send(void)
 		return;
 	}
 
+	err = zbus_chan_pub(&ENVIRONMENTAL_CHAN, &environmental_msg, K_SECONDS(1));
+	if (err) {
+		LOG_ERR("zbus_chan_pub, error: %d", err);
+		SEND_FATAL_ERROR();
+		return;
+	}
+
 	/* Send FOTA poll trigger */
 	err = zbus_chan_pub(&TRIGGER_CHAN, &poll_trigger, K_SECONDS(1));
 	if (err) {

app/src/modules/cloud/cloud_module.c

@@ -28,11 +28,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 MAX_MSG_SIZE	(MAX(sizeof(struct cloud_payload),					\
-			 MAX(sizeof(struct network_msg), sizeof(struct battery_msg))))
+			 MAX(sizeof(struct network_msg),					\
+			 MAX(sizeof(struct battery_msg), sizeof(struct environmental_msg)))))
 
 BUILD_ASSERT(CONFIG_APP_CLOUD_WATCHDOG_TIMEOUT_SECONDS >
-			 CONFIG_APP_CLOUD_EXEC_TIME_SECONDS_MAX,
-			 "Watchdog timeout must be greater than maximum execution time");
+	     CONFIG_APP_CLOUD_EXEC_TIME_SECONDS_MAX,
+	     "Watchdog timeout must be greater than maximum execution time");
 
 /* Register subscriber */
 ZBUS_MSG_SUBSCRIBER_DEFINE(cloud);
@@ -42,6 +43,7 @@ ZBUS_CHAN_ADD_OBS(PAYLOAD_CHAN, cloud, 0);
 ZBUS_CHAN_ADD_OBS(NETWORK_CHAN, cloud, 0);
 ZBUS_CHAN_ADD_OBS(BATTERY_CHAN, cloud, 0);
 ZBUS_CHAN_ADD_OBS(TRIGGER_CHAN, cloud, 0);
+ZBUS_CHAN_ADD_OBS(ENVIRONMENTAL_CHAN, cloud, 0);
 
 /* Define channels provided by this module */
 
@@ -546,6 +548,38 @@ static void state_connected_ready_run(void *o)
 		}
 	}
 
+	if (state_object->chan == &ENVIRONMENTAL_CHAN) {
+		struct environmental_msg msg = MSG_TO_ENVIRONMENTAL_MSG(state_object->msg_buf);
+
+		if (msg.type == ENVIRONMENTAL_SENSOR_SAMPLE_RESPONSE) {
+			err = nrf_cloud_coap_sensor_send(NRF_CLOUD_JSON_APPID_VAL_TEMP,
+							 msg.temperature,
+							 NRF_CLOUD_NO_TIMESTAMP, true);
+			if (err) {
+				LOG_ERR("nrf_cloud_coap_sensor_send, error: %d", err);
+				SEND_FATAL_ERROR();
+			}
+
+			err = nrf_cloud_coap_sensor_send(NRF_CLOUD_JSON_APPID_VAL_AIR_PRESS,
+							 msg.pressure,
+							 NRF_CLOUD_NO_TIMESTAMP, true);
+			if (err) {
+				LOG_ERR("nrf_cloud_coap_sensor_send, error: %d", err);
+				SEND_FATAL_ERROR();
+			}
+
+			err = nrf_cloud_coap_sensor_send(NRF_CLOUD_JSON_APPID_VAL_HUMID,
+							 msg.humidity,
+							 NRF_CLOUD_NO_TIMESTAMP, true);
+			if (err) {
+				LOG_ERR("nrf_cloud_coap_sensor_send, error: %d", err);
+				SEND_FATAL_ERROR();
+			}
+
+			return;
+		}
+	}
+
 	if (state_object->chan == &PAYLOAD_CHAN) {
 		struct cloud_payload *payload = MSG_TO_PAYLOAD(state_object->msg_buf);
 

app/src/modules/environmental/Kconfig.environmental

@@ -6,7 +6,7 @@
 
 menuconfig APP_ENVIRONMENTAL
 	bool "Environmental module"
-	depends on BME68X_IAQ
+	depends on BME680
 	default y
 
 if APP_ENVIRONMENTAL