This is an automated email from the ASF dual-hosted git repository.
lupyuen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 8021b5371e0 sensors/bme680_uorb.c: always allow temperature topic
registration
8021b5371e0 is described below
commit 8021b5371e022a225825827ecbabe01703d32b3a
Author: raiden00pl <[email protected]>
AuthorDate: Sat May 10 08:36:18 2025 +0200
sensors/bme680_uorb.c: always allow temperature topic registration
Previously bme680 dont register temperature topic when pressure measurement
was enabled. Temperature data is present in barometer data, but sometimes
we need clear separation between these topics.
The old behavior is still achievable by setting
CONFIG_BME680_DISABLE_TEMP_MEAS=y
Signed-off-by: raiden00pl <[email protected]>
---
drivers/sensors/Kconfig | 6 +++
drivers/sensors/bme680_uorb.c | 90 +++++++++++++++++++++++--------------------
2 files changed, 55 insertions(+), 41 deletions(-)
diff --git a/drivers/sensors/Kconfig b/drivers/sensors/Kconfig
index 4f6a42714d7..e09077d745d 100644
--- a/drivers/sensors/Kconfig
+++ b/drivers/sensors/Kconfig
@@ -617,6 +617,12 @@ config BME680_I2C_FREQUENCY
int "BME680 I2C frequency"
default 400000
+config BME680_DISABLE_TEMP_MEAS
+ bool "Disable Temperature Measurement"
+ default n
+ ---help---
+ If enabled, the sensor will not measure temperature.
+
config BME680_DISABLE_PRESS_MEAS
bool "Disable Pressure Measurement"
default n
diff --git a/drivers/sensors/bme680_uorb.c b/drivers/sensors/bme680_uorb.c
index 3b8c00ac11f..11f04ea854a 100644
--- a/drivers/sensors/bme680_uorb.c
+++ b/drivers/sensors/bme680_uorb.c
@@ -61,7 +61,7 @@
/* Sub-sensor definitions */
-#ifdef CONFIG_BME680_DISABLE_PRESS_MEAS
+#ifndef CONFIG_BME680_DISABLE_TEMP_MEAS
# define BME680_TEMP_IDX (0)
#else
# define BME680_TEMP_IDX (-1)
@@ -373,12 +373,14 @@ static int bme680_putreg8(FAR struct bme680_dev_s *priv,
uint8_t regaddr,
static int bme680_getregs(FAR struct bme680_dev_s *priv, uint8_t regaddr,
uint8_t *rxbuffer, uint8_t length);
+#ifndef CONFIG_BME680_DISABLE_TEMP_MEAS
+static int bme680_push_temp_data(FAR struct bme680_dev_s *priv,
+ FAR struct bme680_data_s *data);
+#endif
+
#ifndef CONFIG_BME680_DISABLE_PRESS_MEAS
static int bme680_push_press_data(FAR struct bme680_dev_s *priv,
FAR struct bme680_data_s *data);
-#else
-static int bme680_push_temp_data(FAR struct bme680_dev_s *priv,
- FAR struct bme680_data_s *data);
#endif
#ifndef CONFIG_BME680_DISABLE_HUM_MEAS
@@ -409,18 +411,20 @@ static int bme680_control(FAR struct sensor_lowerhalf_s
*lower,
static const push_data_func deliver_data[BME680_SENSORS_COUNT] =
{
+#ifndef CONFIG_BME680_DISABLE_TEMP_MEAS
+ bme680_push_temp_data,
+#endif
+
#ifndef CONFIG_BME680_DISABLE_PRESS_MEAS
- bme680_push_press_data
-#else
- bme680_push_temp_data
+ bme680_push_press_data,
#endif
#ifndef CONFIG_BME680_DISABLE_HUM_MEAS
- , bme680_push_hum_data
+ bme680_push_hum_data,
#endif
#ifndef CONFIG_BME680_DISABLE_GAS_MEAS
- , bme680_push_gas_data
+ bme680_push_gas_data,
#endif
};
@@ -791,55 +795,57 @@ static int bme680_set_oversamp(FAR struct bme680_dev_s
*priv)
return OK;
}
-#ifndef CONFIG_BME680_DISABLE_PRESS_MEAS
+#ifndef CONFIG_BME680_DISABLE_TEMP_MEAS
/****************************************************************************
- * Name: bme680_push_press_data
+ * Name: bme680_push_temp_data
****************************************************************************/
-static int bme680_push_press_data(FAR struct bme680_dev_s *priv,
- FAR struct bme680_data_s *data)
+static int bme680_push_temp_data(FAR struct bme680_dev_s *priv,
+ FAR struct bme680_data_s *data)
{
- struct sensor_baro press_data;
+ struct sensor_temp temp_data;
int ret;
- struct sensor_lowerhalf_s lower = priv->dev.lower[BME680_PRESS_IDX];
+ struct sensor_lowerhalf_s lower = priv->dev.lower[BME680_TEMP_IDX];
- press_data.timestamp = data->timestamp;
- press_data.temperature = data->temperature;
- press_data.pressure = data->pressure / 100.f;
+ temp_data.timestamp = data->timestamp;
+ temp_data.temperature = data->temperature;
- ret = lower.push_event(lower.priv, &press_data,
- sizeof(struct sensor_baro));
+ ret = lower.push_event(lower.priv, &temp_data, sizeof(struct sensor_temp));
if (ret < 0)
{
- snerr("Pushing baro data failed\n");
+ snerr("Pushing temperature data failed\n");
return ret;
}
return OK;
}
-#else
+#endif /* !CONFIG_BME680_DISABLE_TEMP_MEAS */
+
+#ifndef CONFIG_BME680_DISABLE_PRESS_MEAS
/****************************************************************************
- * Name: bme680_push_temp_data
+ * Name: bme680_push_press_data
****************************************************************************/
-static int bme680_push_temp_data(FAR struct bme680_dev_s *priv,
- FAR struct bme680_data_s *data)
+static int bme680_push_press_data(FAR struct bme680_dev_s *priv,
+ FAR struct bme680_data_s *data)
{
- struct sensor_temp temp_data;
+ struct sensor_baro press_data;
int ret;
- struct sensor_lowerhalf_s lower = priv->dev.lower[BME680_TEMP_IDX];
+ struct sensor_lowerhalf_s lower = priv->dev.lower[BME680_PRESS_IDX];
- temp_data.timestamp = data->timestamp;
- temp_data.temperature = data->temperature;
+ press_data.timestamp = data->timestamp;
+ press_data.temperature = data->temperature;
+ press_data.pressure = data->pressure / 100.f;
- ret = lower.push_event(lower.priv, &temp_data, sizeof(struct sensor_temp));
+ ret = lower.push_event(lower.priv, &press_data,
+ sizeof(struct sensor_baro));
if (ret < 0)
{
- snerr("Pushing temperature data failed\n");
+ snerr("Pushing baro data failed\n");
return ret;
}
@@ -1752,31 +1758,33 @@ int bme680_register(int devno, FAR struct i2c_master_s
*i2c,
}
}
-#ifndef CONFIG_BME680_DISABLE_PRESS_MEAS
- /* Register the barometer driver */
+#ifndef CONFIG_BME680_DISABLE_TEMP_MEAS
+ /* Register the temperature driver */
- lower = &priv->dev.lower[BME680_PRESS_IDX];
+ lower = &priv->dev.lower[BME680_TEMP_IDX];
lower->ops = &g_sensor_ops;
- lower->type = SENSOR_TYPE_BAROMETER;
+ lower->type = SENSOR_TYPE_AMBIENT_TEMPERATURE;
ret = sensor_register(lower, devno);
if (ret < 0)
{
- snerr("ERROR: Failed to register barometer driver (err = %d)\n",
+ snerr("ERROR: Failed to register temperature driver (err = %d)\n",
ret);
goto err_init;
}
-#else
- /* Register the temperature driver */
+#endif
- lower = &priv->dev.lower[BME680_TEMP_IDX];
+#ifndef CONFIG_BME680_DISABLE_PRESS_MEAS
+ /* Register the barometer driver */
+
+ lower = &priv->dev.lower[BME680_PRESS_IDX];
lower->ops = &g_sensor_ops;
- lower->type = SENSOR_TYPE_AMBIENT_TEMPERATURE;
+ lower->type = SENSOR_TYPE_BAROMETER;
ret = sensor_register(lower, devno);
if (ret < 0)
{
- snerr("ERROR: Failed to register temperature driver (err = %d)\n",
+ snerr("ERROR: Failed to register barometer driver (err = %d)\n",
ret);
goto err_init;
}
