.. | .. |
---|
3 | 3 | #define BME680_H_ |
---|
4 | 4 | |
---|
5 | 5 | #define BME680_REG_CHIP_ID 0xD0 |
---|
6 | | -#define BME680_CHIP_ID_VAL 0x61 |
---|
| 6 | +#define BME680_CHIP_ID_VAL 0x61 |
---|
7 | 7 | #define BME680_REG_SOFT_RESET 0xE0 |
---|
8 | | -#define BME680_CMD_SOFTRESET 0xB6 |
---|
| 8 | +#define BME680_CMD_SOFTRESET 0xB6 |
---|
9 | 9 | #define BME680_REG_STATUS 0x73 |
---|
10 | 10 | #define BME680_SPI_MEM_PAGE_BIT BIT(4) |
---|
11 | 11 | #define BME680_SPI_MEM_PAGE_1_VAL 1 |
---|
.. | .. |
---|
16 | 16 | #define BME680_REG_GAS_MSB 0x2A |
---|
17 | 17 | #define BME680_REG_GAS_R_LSB 0x2B |
---|
18 | 18 | #define BME680_GAS_STAB_BIT BIT(4) |
---|
| 19 | +#define BME680_GAS_RANGE_MASK GENMASK(3, 0) |
---|
19 | 20 | |
---|
20 | 21 | #define BME680_REG_CTRL_HUMIDITY 0x72 |
---|
21 | 22 | #define BME680_OSRS_HUMIDITY_MASK GENMASK(2, 0) |
---|
.. | .. |
---|
24 | 25 | #define BME680_OSRS_TEMP_MASK GENMASK(7, 5) |
---|
25 | 26 | #define BME680_OSRS_PRESS_MASK GENMASK(4, 2) |
---|
26 | 27 | #define BME680_MODE_MASK GENMASK(1, 0) |
---|
27 | | - |
---|
28 | | -#define BME680_MODE_FORCED 1 |
---|
29 | | -#define BME680_MODE_SLEEP 0 |
---|
| 28 | +#define BME680_MODE_FORCED 1 |
---|
| 29 | +#define BME680_MODE_SLEEP 0 |
---|
30 | 30 | |
---|
31 | 31 | #define BME680_REG_CONFIG 0x75 |
---|
32 | 32 | #define BME680_FILTER_MASK GENMASK(4, 2) |
---|
.. | .. |
---|
37 | 37 | |
---|
38 | 38 | #define BME680_MAX_OVERFLOW_VAL 0x40000000 |
---|
39 | 39 | #define BME680_HUM_REG_SHIFT_VAL 4 |
---|
40 | | -#define BME680_BIT_H1_DATA_MSK 0x0F |
---|
| 40 | +#define BME680_BIT_H1_DATA_MASK GENMASK(3, 0) |
---|
41 | 41 | |
---|
42 | 42 | #define BME680_REG_RES_HEAT_RANGE 0x02 |
---|
43 | | -#define BME680_RHRANGE_MSK 0x30 |
---|
| 43 | +#define BME680_RHRANGE_MASK GENMASK(5, 4) |
---|
44 | 44 | #define BME680_REG_RES_HEAT_VAL 0x00 |
---|
45 | 45 | #define BME680_REG_RANGE_SW_ERR 0x04 |
---|
46 | | -#define BME680_RSERROR_MSK 0xF0 |
---|
| 46 | +#define BME680_RSERROR_MASK GENMASK(7, 4) |
---|
47 | 47 | #define BME680_REG_RES_HEAT_0 0x5A |
---|
48 | 48 | #define BME680_REG_GAS_WAIT_0 0x64 |
---|
49 | | -#define BME680_GAS_RANGE_MASK 0x0F |
---|
50 | 49 | #define BME680_ADC_GAS_RES_SHIFT 6 |
---|
51 | 50 | #define BME680_AMB_TEMP 25 |
---|
52 | 51 | |
---|
53 | 52 | #define BME680_REG_CTRL_GAS_1 0x71 |
---|
54 | 53 | #define BME680_RUN_GAS_MASK BIT(4) |
---|
55 | 54 | #define BME680_NB_CONV_MASK GENMASK(3, 0) |
---|
56 | | -#define BME680_RUN_GAS_EN_BIT BIT(4) |
---|
57 | | -#define BME680_NB_CONV_0_VAL 0 |
---|
58 | 55 | |
---|
59 | 56 | #define BME680_REG_MEAS_STAT_0 0x1D |
---|
60 | 57 | #define BME680_GAS_MEAS_BIT BIT(6) |
---|