|
@@ -4,10 +4,10 @@
|
|
|
|
|
|
#define BME680_REG_CHIP_I2C_ID 0xD0
|
|
|
#define BME680_REG_CHIP_SPI_ID 0x50
|
|
|
-#define BME680_CHIP_ID_VAL 0x61
|
|
|
+#define BME680_CHIP_ID_VAL 0x61
|
|
|
#define BME680_REG_SOFT_RESET_I2C 0xE0
|
|
|
#define BME680_REG_SOFT_RESET_SPI 0x60
|
|
|
-#define BME680_CMD_SOFTRESET 0xB6
|
|
|
+#define BME680_CMD_SOFTRESET 0xB6
|
|
|
#define BME680_REG_STATUS 0x73
|
|
|
#define BME680_SPI_MEM_PAGE_BIT BIT(4)
|
|
|
#define BME680_SPI_MEM_PAGE_1_VAL 1
|
|
@@ -18,6 +18,7 @@
|
|
|
#define BME680_REG_GAS_MSB 0x2A
|
|
|
#define BME680_REG_GAS_R_LSB 0x2B
|
|
|
#define BME680_GAS_STAB_BIT BIT(4)
|
|
|
+#define BME680_GAS_RANGE_MASK 0x0F
|
|
|
|
|
|
#define BME680_REG_CTRL_HUMIDITY 0x72
|
|
|
#define BME680_OSRS_HUMIDITY_MASK GENMASK(2, 0)
|
|
@@ -26,9 +27,8 @@
|
|
|
#define BME680_OSRS_TEMP_MASK GENMASK(7, 5)
|
|
|
#define BME680_OSRS_PRESS_MASK GENMASK(4, 2)
|
|
|
#define BME680_MODE_MASK GENMASK(1, 0)
|
|
|
-
|
|
|
-#define BME680_MODE_FORCED 1
|
|
|
-#define BME680_MODE_SLEEP 0
|
|
|
+#define BME680_MODE_FORCED 1
|
|
|
+#define BME680_MODE_SLEEP 0
|
|
|
|
|
|
#define BME680_REG_CONFIG 0x75
|
|
|
#define BME680_FILTER_MASK GENMASK(4, 2)
|
|
@@ -42,13 +42,12 @@
|
|
|
#define BME680_BIT_H1_DATA_MSK 0x0F
|
|
|
|
|
|
#define BME680_REG_RES_HEAT_RANGE 0x02
|
|
|
-#define BME680_RHRANGE_MSK 0x30
|
|
|
+#define BME680_RHRANGE_MSK 0x30
|
|
|
#define BME680_REG_RES_HEAT_VAL 0x00
|
|
|
#define BME680_REG_RANGE_SW_ERR 0x04
|
|
|
-#define BME680_RSERROR_MSK 0xF0
|
|
|
+#define BME680_RSERROR_MSK 0xF0
|
|
|
#define BME680_REG_RES_HEAT_0 0x5A
|
|
|
#define BME680_REG_GAS_WAIT_0 0x64
|
|
|
-#define BME680_GAS_RANGE_MASK 0x0F
|
|
|
#define BME680_ADC_GAS_RES_SHIFT 6
|
|
|
#define BME680_AMB_TEMP 25
|
|
|
|