michaelh/zephyr
1
0
Fork 0
Code Releases Activity

sensor: bme680: convert to i2c_dt_spec

Browse source 
Convert bme680 driver to `struct i2c_dt_spec` as a demonstration.

Signed-off-by: Jordan Yates <jordan.yates@data61.csiro.au>
This commit is contained in:
Jordan Yates 2021-08-01 20:15:54 +10:00 • committed by Anas Nashif
commit 7bdb22941c
2 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

66
drivers/sensor/bme680/bme680.c
View file

@ -24,19 +24,19 @@
#include <logging/log.h> #include <logging/log.h>
LOG_MODULE_REGISTER(bme680, CONFIG_SENSOR_LOG_LEVEL); LOG_MODULE_REGISTER(bme680, CONFIG_SENSOR_LOG_LEVEL);
static int bme680_reg_read(struct bme680_data *data, uint8_t start, uint8_t *buf, static int bme680_reg_read(const struct device *dev, uint8_t start,
int size) uint8_t *buf, int size)
{ {
return i2c_burst_read(data->i2c_master, data->i2c_slave_addr, start, const struct bme680_config *config = dev->config;
buf, size);
return 0; return i2c_burst_read_dt(&config->bus, start, buf, size);
} }
static int bme680_reg_write(struct bme680_data *data, uint8_t reg, uint8_t val) static int bme680_reg_write(const struct device *dev, uint8_t reg, uint8_t val)
{ {
return i2c_reg_write_byte(data->i2c_master, data->i2c_slave_addr, const struct bme680_config *config = dev->config;
reg, val);
return 0; return i2c_reg_write_byte_dt(&config->bus, reg, val);
} }
static void bme680_calc_temp(struct bme680_data *data, uint32_t adc_temp) static void bme680_calc_temp(struct bme680_data *data, uint32_t adc_temp)
@ -201,7 +201,7 @@ static int bme680_sample_fetch(const struct device *dev,
__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL); __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL);
ret = bme680_reg_read(data, BME680_REG_FIELD0, buff, size); ret = bme680_reg_read(dev, BME680_REG_FIELD0, buff, size);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -225,7 +225,7 @@ static int bme680_sample_fetch(const struct device *dev,
} }
/* Trigger the next measurement */ /* Trigger the next measurement */
ret = bme680_reg_write(data, BME680_REG_CTRL_MEAS, ret = bme680_reg_write(dev, BME680_REG_CTRL_MEAS,
BME680_CTRL_MEAS_VAL); BME680_CTRL_MEAS_VAL);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
@ -280,23 +280,24 @@ static int bme680_channel_get(const struct device *dev,
return 0; return 0;
} }
static int bme680_read_compensation(struct bme680_data *data) static int bme680_read_compensation(const struct device *dev)
{ {
struct bme680_data *data = dev->data;
uint8_t buff[BME680_LEN_COEFF_ALL]; uint8_t buff[BME680_LEN_COEFF_ALL];
int err = 0; int err = 0;
err = bme680_reg_read(data, BME680_REG_COEFF1, buff, BME680_LEN_COEFF1); err = bme680_reg_read(dev, BME680_REG_COEFF1, buff, BME680_LEN_COEFF1);
if (err < 0) { if (err < 0) {
return err; return err;
} }
err = bme680_reg_read(data, BME680_REG_COEFF2, &buff[BME680_LEN_COEFF1], err = bme680_reg_read(dev, BME680_REG_COEFF2, &buff[BME680_LEN_COEFF1],
16); 16);
if (err < 0) { if (err < 0) {
return err; return err;
} }
err = bme680_reg_read(data, BME680_REG_COEFF3, err = bme680_reg_read(dev, BME680_REG_COEFF3,
&buff[BME680_LEN_COEFF1 + BME680_LEN_COEFF2], &buff[BME680_LEN_COEFF1 + BME680_LEN_COEFF2],
BME680_LEN_COEFF3); BME680_LEN_COEFF3);
if (err < 0) { if (err < 0) {
@ -346,7 +347,7 @@ static int bme680_chip_init(const struct device *dev)
struct bme680_data *data = (struct bme680_data *)dev->data; struct bme680_data *data = (struct bme680_data *)dev->data;
int err; int err;
err = bme680_reg_read(data, BME680_REG_CHIP_ID, &data->chip_id, 1); err = bme680_reg_read(dev, BME680_REG_CHIP_ID, &data->chip_id, 1);
if (err < 0) { if (err < 0) {
return err; return err;
} }
@ -358,40 +359,40 @@ static int bme680_chip_init(const struct device *dev)
return -ENOTSUP; return -ENOTSUP;
} }
err = bme680_read_compensation(data); err = bme680_read_compensation(dev);
if (err < 0) { if (err < 0) {
return err; return err;
} }
err = bme680_reg_write(data, BME680_REG_CTRL_HUM, BME680_HUMIDITY_OVER); err = bme680_reg_write(dev, BME680_REG_CTRL_HUM, BME680_HUMIDITY_OVER);
if (err < 0) { if (err < 0) {
return err; return err;
} }
err = bme680_reg_write(data, BME680_REG_CONFIG, BME680_CONFIG_VAL); err = bme680_reg_write(dev, BME680_REG_CONFIG, BME680_CONFIG_VAL);
if (err < 0) { if (err < 0) {
return err; return err;
} }
err = bme680_reg_write(data, BME680_REG_CTRL_GAS_1, err = bme680_reg_write(dev, BME680_REG_CTRL_GAS_1,
BME680_CTRL_GAS_1_VAL); BME680_CTRL_GAS_1_VAL);
if (err < 0) { if (err < 0) {
return err; return err;
} }
err = bme680_reg_write(data, BME680_REG_RES_HEAT0, err = bme680_reg_write(dev, BME680_REG_RES_HEAT0,
bme680_calc_res_heat(data, BME680_HEATR_TEMP)); bme680_calc_res_heat(data, BME680_HEATR_TEMP));
if (err < 0) { if (err < 0) {
return err; return err;
} }
err = bme680_reg_write(data, BME680_REG_GAS_WAIT0, err = bme680_reg_write(dev, BME680_REG_GAS_WAIT0,
bme680_calc_gas_wait(BME680_HEATR_DUR_MS)); bme680_calc_gas_wait(BME680_HEATR_DUR_MS));
if (err < 0) { if (err < 0) {
return err; return err;
} }
err = bme680_reg_write(data, BME680_REG_CTRL_MEAS, err = bme680_reg_write(dev, BME680_REG_CTRL_MEAS,
BME680_CTRL_MEAS_VAL); BME680_CTRL_MEAS_VAL);
if (err < 0) { if (err < 0) {
return err; return err;
@ -402,18 +403,13 @@ static int bme680_chip_init(const struct device *dev)
static int bme680_init(const struct device *dev) static int bme680_init(const struct device *dev)
{ {
struct bme680_data *data = dev->data; const struct bme680_config *config = dev->config;
data->i2c_master = device_get_binding( if (!device_is_ready(config->bus.bus)) {
DT_INST_BUS_LABEL(0)); LOG_ERR("I2C master %s not ready", config->bus.bus->name);
if (!data->i2c_master) {
LOG_ERR("I2C master not found: %s",
DT_INST_BUS_LABEL(0));
return -EINVAL; return -EINVAL;
} }
data->i2c_slave_addr = DT_INST_REG_ADDR(0);
if (bme680_chip_init(dev) < 0) { if (bme680_chip_init(dev) < 0) {
return -EINVAL; return -EINVAL;
} }
@ -428,6 +424,10 @@ static const struct sensor_driver_api bme680_api_funcs = {
static struct bme680_data bme680_data; static struct bme680_data bme680_data;
static const struct bme680_config bme680_config = {
.bus = I2C_DT_SPEC_INST_GET(0)
};
DEVICE_DT_INST_DEFINE(0, bme680_init, NULL, &bme680_data, DEVICE_DT_INST_DEFINE(0, bme680_init, NULL, &bme680_data,
NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &bme680_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY,
&bme680_api_funcs); &bme680_api_funcs);

10
drivers/sensor/bme680/bme680.h
View file

@ -8,8 +8,7 @@
#define __SENSOR_BME680_H__ #define __SENSOR_BME680_H__
#include <device.h> #include <device.h>
#include <zephyr/types.h> #include <drivers/i2c.h>
#define BME680_CHIP_ID 0x61 #define BME680_CHIP_ID 0x61
@ -120,9 +119,6 @@
#define BME680_CONCAT_BYTES(msb, lsb) (((uint16_t)msb << 8) | (uint16_t)lsb) #define BME680_CONCAT_BYTES(msb, lsb) (((uint16_t)msb << 8) | (uint16_t)lsb)
struct bme680_data { struct bme680_data {
const struct device *i2c_master;
uint16_t i2c_slave_addr;
/* Compensation parameters. */ /* Compensation parameters. */
uint16_t par_h1; uint16_t par_h1;
uint16_t par_h2; uint16_t par_h2;
@ -167,4 +163,8 @@ struct bme680_data {
uint8_t chip_id; uint8_t chip_id;
}; };
struct bme680_config {
struct i2c_dt_spec bus;
};
#endif /* __SENSOR_BME680_H__ */ #endif /* __SENSOR_BME680_H__ */