Loading include/driver/bme680.h +388 −155 Original line number Diff line number Diff line Loading @@ -44,6 +44,8 @@ * @version 3.5.9 * @brief * * Adjustments for multipass by Daniel Friesel: C -> C++, multipass i2c integration * */ /*! @file bme680.h @brief Sensor driver for BME680 sensor */ Loading @@ -53,26 +55,267 @@ #ifndef BME680_H_ #define BME680_H_ /*! CPP guard */ #ifdef __cplusplus extern "C" { #endif /* Header includes */ #include "driver/bme680_defs.h" /* function prototype declarations */ class BME680 { private: BME680(const BME680 ©); unsigned char txbuf[16]; unsigned char rxbuf[8]; /*! Chip Id */ uint8_t chip_id; /*! Device Id */ uint8_t dev_id; /*! Memory page used */ uint8_t mem_page; /*! Sensor calibration data */ struct bme680_calib_data calib; /*! New sensor fields */ uint8_t new_fields; /*! Store the info messages */ uint8_t info_msg; /*! Communication function result */ int8_t com_rslt; /*! * @brief This internal API is used to read the calibrated data from the sensor. * * This function is used to retrieve the calibration * data from the image registers of the sensor. * * @note Registers 89h to A1h for calibration data 1 to 24 * from bit 0 to 7 * @note Registers E1h to F0h for calibration data 25 to 40 * from bit 0 to 7 * * @return Result of API execution status. * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t getCalibData(); /*! * @brief This internal API is used to set the gas configuration of the sensor. * * @return Result of API execution status. * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t setGasConfig(); /*! * @brief This internal API is used to get the gas configuration of the sensor. * @note heatr_temp and heatr_dur values are currently register data * and not the actual values set * * @return Result of API execution status. * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t getGasConfig(); /*! * @brief This internal API is used to calculate the Heat duration value. * * @param[in] dur :Value of the duration to be shared. * * @return uint8_t threshold duration after calculation. */ uint8_t calcHeaterDur(uint16_t dur); #ifndef BME680_FLOAT_POINT_COMPENSATION /*! * @brief This internal API is used to calculate the temperature value. * * @param[in] temp_adc :Contains the temperature ADC value . * * @return uint32_t calculated temperature. */ int16_t calcTemperature(uint32_t temp_adc); /*! * @brief This internal API is used to calculate the pressure value. * * @param[in] pres_adc :Contains the pressure ADC value . * * @return uint32_t calculated pressure. */ uint32_t calcPressure(uint32_t pres_adc); /*! * @brief This internal API is used to calculate the humidity value. * * @param[in] hum_adc :Contains the humidity ADC value. * * @return uint32_t calculated humidity. */ uint32_t calcHumidity(uint16_t hum_adc); /*! * @brief This internal API is used to calculate the Gas Resistance value. * * @param[in] gas_res_adc :Contains the Gas Resistance ADC value. * @param[in] gas_range :Contains the range of gas values. * * @return uint32_t calculated gas resistance. */ uint32_t calcGasResistance(uint16_t gas_res_adc, uint8_t gas_range); /*! * @brief This internal API is used to calculate the Heat Resistance value. * * @param[in] temp : Contains the target temperature value. * * @return uint8_t calculated heater resistance. */ uint8_t calcHeaterRes(uint16_t temp); #else /*! * @brief This internal API is used to calculate the * temperature value value in float format * * @param[in] temp_adc :Contains the temperature ADC value . * * @return Calculated temperature in float */ float calcTemperature(uint32_t temp_adc); /*! * @brief This internal API is used to calculate the * pressure value value in float format * * @param[in] pres_adc :Contains the pressure ADC value . * * @return Calculated pressure in float. */ float calcPressure(uint32_t pres_adc); /*! * @brief This internal API is used to calculate the * humidity value value in float format * * @param[in] hum_adc :Contains the humidity ADC value. * * @return Calculated humidity in float. */ float calcHumidity(uint16_t hum_adc); /*! * @brief This internal API is used to calculate the * gas resistance value value in float format * * @param[in] gas_res_adc :Contains the Gas Resistance ADC value. * @param[in] gas_range :Contains the range of gas values. * * @return Calculated gas resistance in float. */ float calcGasResistance(uint16_t gas_res_adc, uint8_t gas_range); /*! * @brief This internal API is used to calculate the * heater resistance value in float format * * @param[in] temp : Contains the target temperature value. * * @return Calculated heater resistance in float. */ float calcHeaterRes(uint16_t temp); #endif /*! * @brief This internal API is used to calculate the field data of sensor. * * @param[out] data :Structure instance to hold the data * * @return int8_t result of the field data from sensor. */ int8_t readFieldData(struct bme680_field_data *data); /*! * @brief This internal API is used to set the memory page * based on register address. * * The value of memory page * value | Description * --------|-------------- * 0 | BME680_PAGE0_SPI * 1 | BME680_PAGE1_SPI * * @param[in] reg_addr :Contains the register address array. * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t setMemPage(uint8_t reg_addr); /*! * @brief This internal API is used to get the memory page based * on register address. * * The value of memory page * value | Description * --------|-------------- * 0 | BME680_PAGE0_SPI * 1 | BME680_PAGE1_SPI * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t getMemPage(); /*! * @brief This internal API is used to validate the device pointer for * null conditions. * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t nullPtrCheck(); /*! * @brief This internal API is used to check the boundary * conditions. * * @param[in] value :pointer to the value. * @param[in] min :minimum value. * @param[in] max :maximum value. * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t boundaryCheck(uint8_t *value, uint8_t min, uint8_t max); public: /*! SPI/I2C interface */ enum bme680_intf intf; /*! Sensor power modes */ uint8_t power_mode; /*! Sensor settings */ struct bme680_tph_sett tph_sett; /*! Gas Sensor settings */ struct bme680_gas_sett gas_sett; /*! Ambient temperature in Degree C */ int8_t amb_temp; /*! Bus read function pointer */ bme680_com_fptr_t read; /*! Bus write function pointer */ bme680_com_fptr_t write; /*! delay function pointer */ bme680_delay_fptr_t delay_ms; BME680(uint8_t const addr) : dev_id(addr) {} /*! * @brief This API is the entry point. * It reads the chip-id and calibration data from the sensor. * * @param[in,out] dev : Structure instance of bme680_dev * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t bme680_init(struct bme680_dev *dev); int8_t init(); /*! * @brief This API writes the given data to the register address Loading @@ -82,12 +325,11 @@ int8_t bme680_init(struct bme680_dev *dev); * @param[in] reg_data : Pointer to data buffer which is to be written * in the sensor. * @param[in] len : No of bytes of data to write.. * @param[in] dev : Structure instance of bme680_dev. * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t bme680_set_regs(const uint8_t *reg_addr, const uint8_t *reg_data, uint8_t len, struct bme680_dev *dev); int8_t setRegs(const uint8_t *reg_addr, const uint8_t *reg_data, uint8_t len); /*! * @brief This API reads the data from the given register address of the sensor. Loading @@ -95,27 +337,23 @@ int8_t bme680_set_regs(const uint8_t *reg_addr, const uint8_t *reg_data, uint8_t * @param[in] reg_addr : Register address from where the data to be read * @param[out] reg_data : Pointer to data buffer to store the read data. * @param[in] len : No of bytes of data to be read. * @param[in] dev : Structure instance of bme680_dev. * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t bme680_get_regs(uint8_t reg_addr, uint8_t *reg_data, uint16_t len, struct bme680_dev *dev); int8_t getRegs(uint8_t reg_addr, uint8_t *reg_data, uint16_t len); /*! * @brief This API performs the soft reset of the sensor. * * @param[in] dev : Structure instance of bme680_dev. * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error. */ int8_t bme680_soft_reset(struct bme680_dev *dev); int8_t softReset(); /*! * @brief This API is used to set the power mode of the sensor. * * @param[in] dev : Structure instance of bme680_dev * @note : Pass the value to bme680_dev.power_mode structure variable. * * value | mode Loading @@ -126,12 +364,11 @@ int8_t bme680_soft_reset(struct bme680_dev *dev); * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t bme680_set_sensor_mode(struct bme680_dev *dev); int8_t setSensorMode(); /*! * @brief This API is used to get the power mode of the sensor. * * @param[in] dev : Structure instance of bme680_dev * @note : bme680_dev.power_mode structure variable hold the power mode. * * value | mode Loading @@ -142,27 +379,25 @@ int8_t bme680_set_sensor_mode(struct bme680_dev *dev); * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t bme680_get_sensor_mode(struct bme680_dev *dev); int8_t getSensorMode(); /*! * @brief This API is used to set the profile duration of the sensor. * * @param[in] dev : Structure instance of bme680_dev. * @param[in] duration : Duration of the measurement in ms. * * @return Nothing */ void bme680_set_profile_dur(uint16_t duration, struct bme680_dev *dev); void setProfileDur(uint16_t duration); /*! * @brief This API is used to get the profile duration of the sensor. * * @param[in] dev : Structure instance of bme680_dev. * @param[in] duration : Duration of the measurement in ms. * * @return Nothing */ void bme680_get_profile_dur(uint16_t *duration, const struct bme680_dev *dev); void getProfileDur(uint16_t *duration); /*! * @brief This API reads the pressure, temperature and humidity and gas data Loading @@ -170,18 +405,16 @@ void bme680_get_profile_dur(uint16_t *duration, const struct bme680_dev *dev); * structure instance passed by the user. * * @param[out] data: Structure instance to hold the data. * @param[in] dev : Structure instance of bme680_dev. * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t bme680_get_sensor_data(struct bme680_field_data *data, struct bme680_dev *dev); int8_t getSensorData(struct bme680_field_data *data); /*! * @brief This API is used to set the oversampling, filter and T,P,H, gas selection * settings in the sensor. * * @param[in] dev : Structure instance of bme680_dev. * @param[in] desired_settings : Variable used to select the settings which * are to be set in the sensor. * Loading @@ -204,22 +437,22 @@ int8_t bme680_get_sensor_data(struct bme680_field_data *data, struct bme680_dev * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error. */ int8_t bme680_set_sensor_settings(uint16_t desired_settings, struct bme680_dev *dev); int8_t setSensorSettings(uint16_t desired_settings); /*! * @brief This API is used to get the oversampling, filter and T,P,H, gas selection * settings in the sensor. * * @param[in] dev : Structure instance of bme680_dev. * @param[in] desired_settings : Variable used to select the settings which * are to be get from the sensor. * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error. */ int8_t bme680_get_sensor_settings(uint16_t desired_settings, struct bme680_dev *dev); #ifdef __cplusplus } #endif /* End of CPP guard */ int8_t getSensorSettings(uint16_t desired_settings); }; extern BME680 bme680; #endif /* BME680_H_ */ /** @}*/ include/driver/bme680_defs.h +0 −36 Original line number Diff line number Diff line Loading @@ -502,42 +502,6 @@ struct bme680_gas_sett { uint16_t heatr_dur; }; /*! * @brief BME680 device structure */ struct bme680_dev { /*! Chip Id */ uint8_t chip_id; /*! Device Id */ uint8_t dev_id; /*! SPI/I2C interface */ enum bme680_intf intf; /*! Memory page used */ uint8_t mem_page; /*! Ambient temperature in Degree C */ int8_t amb_temp; /*! Sensor calibration data */ struct bme680_calib_data calib; /*! Sensor settings */ struct bme680_tph_sett tph_sett; /*! Gas Sensor settings */ struct bme680_gas_sett gas_sett; /*! Sensor power modes */ uint8_t power_mode; /*! New sensor fields */ uint8_t new_fields; /*! Store the info messages */ uint8_t info_msg; /*! Bus read function pointer */ bme680_com_fptr_t read; /*! Bus write function pointer */ bme680_com_fptr_t write; /*! delay function pointer */ bme680_delay_fptr_t delay_ms; /*! Communication function result */ int8_t com_rslt; }; #endif /* BME680_DEFS_H_ */ Loading src/app/i2cdetect/main.cc +18 −21 Original line number Diff line number Diff line Loading @@ -47,35 +47,32 @@ void loop(void) } #endif #ifdef DRIVER_BME680 struct bme680_dev gas_sensor; gas_sensor.dev_id = BME680_I2C_ADDR_SECONDARY; gas_sensor.intf = BME680_I2C_INTF; gas_sensor.read = bme680_i2c_read; gas_sensor.write = bme680_i2c_write; gas_sensor.delay_ms = bme680_delay_ms; bme680.intf = BME680_I2C_INTF; bme680.read = bme680_i2c_read; bme680.write = bme680_i2c_write; bme680.delay_ms = bme680_delay_ms; /* amb_temp can be set to 25 prior to configuring the gas sensor * or by performing a few temperature readings without operating the gas sensor. */ gas_sensor.amb_temp = 25; bme680.amb_temp = 25; int8_t rslt = BME680_OK; rslt = bme680_init(&gas_sensor); rslt = bme680.init(); kout << "BME680 init " << rslt << endl; gas_sensor.power_mode = BME680_FORCED_MODE; gas_sensor.tph_sett.os_hum = BME680_OS_1X; gas_sensor.tph_sett.os_pres = BME680_OS_16X; gas_sensor.tph_sett.os_temp = BME680_OS_2X; gas_sensor.gas_sett.run_gas = BME680_ENABLE_GAS_MEAS; gas_sensor.gas_sett.heatr_dur = 150; gas_sensor.gas_sett.heatr_temp = 300; bme680_set_sensor_settings(BME680_OST_SEL | BME680_OSP_SEL | BME680_OSH_SEL | BME680_GAS_SENSOR_SEL, &gas_sensor); bme680_set_sensor_mode(&gas_sensor); arch.delay_ms(500); bme680.power_mode = BME680_FORCED_MODE; bme680.tph_sett.os_hum = BME680_OS_1X; bme680.tph_sett.os_pres = BME680_OS_16X; bme680.tph_sett.os_temp = BME680_OS_2X; bme680.gas_sett.run_gas = BME680_ENABLE_GAS_MEAS; bme680.gas_sett.heatr_dur = 30; bme680.gas_sett.heatr_temp = 300; bme680.setSensorSettings(BME680_OST_SEL | BME680_OSP_SEL | BME680_OSH_SEL | BME680_GAS_SENSOR_SEL); bme680.setSensorMode(); arch.delay_ms(200); struct bme680_field_data data; bme680_get_sensor_data(&data, &gas_sensor); bme680.getSensorData(&data); kout << "BME680 temperature " << (float)data.temperature / 100 << " degC" << endl; kout << "BME680 humidity " << (float)data.humidity / 1000 << " %" << endl; kout << "BME680 pressure " << (float)data.pressure / 100 << " hPa" << endl; Loading src/driver/bme680.cc +243 −471 File changed.Preview size limit exceeded, changes collapsed. Show changes Loading
include/driver/bme680.h +388 −155 Original line number Diff line number Diff line Loading @@ -44,6 +44,8 @@ * @version 3.5.9 * @brief * * Adjustments for multipass by Daniel Friesel: C -> C++, multipass i2c integration * */ /*! @file bme680.h @brief Sensor driver for BME680 sensor */ Loading @@ -53,26 +55,267 @@ #ifndef BME680_H_ #define BME680_H_ /*! CPP guard */ #ifdef __cplusplus extern "C" { #endif /* Header includes */ #include "driver/bme680_defs.h" /* function prototype declarations */ class BME680 { private: BME680(const BME680 ©); unsigned char txbuf[16]; unsigned char rxbuf[8]; /*! Chip Id */ uint8_t chip_id; /*! Device Id */ uint8_t dev_id; /*! Memory page used */ uint8_t mem_page; /*! Sensor calibration data */ struct bme680_calib_data calib; /*! New sensor fields */ uint8_t new_fields; /*! Store the info messages */ uint8_t info_msg; /*! Communication function result */ int8_t com_rslt; /*! * @brief This internal API is used to read the calibrated data from the sensor. * * This function is used to retrieve the calibration * data from the image registers of the sensor. * * @note Registers 89h to A1h for calibration data 1 to 24 * from bit 0 to 7 * @note Registers E1h to F0h for calibration data 25 to 40 * from bit 0 to 7 * * @return Result of API execution status. * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t getCalibData(); /*! * @brief This internal API is used to set the gas configuration of the sensor. * * @return Result of API execution status. * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t setGasConfig(); /*! * @brief This internal API is used to get the gas configuration of the sensor. * @note heatr_temp and heatr_dur values are currently register data * and not the actual values set * * @return Result of API execution status. * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t getGasConfig(); /*! * @brief This internal API is used to calculate the Heat duration value. * * @param[in] dur :Value of the duration to be shared. * * @return uint8_t threshold duration after calculation. */ uint8_t calcHeaterDur(uint16_t dur); #ifndef BME680_FLOAT_POINT_COMPENSATION /*! * @brief This internal API is used to calculate the temperature value. * * @param[in] temp_adc :Contains the temperature ADC value . * * @return uint32_t calculated temperature. */ int16_t calcTemperature(uint32_t temp_adc); /*! * @brief This internal API is used to calculate the pressure value. * * @param[in] pres_adc :Contains the pressure ADC value . * * @return uint32_t calculated pressure. */ uint32_t calcPressure(uint32_t pres_adc); /*! * @brief This internal API is used to calculate the humidity value. * * @param[in] hum_adc :Contains the humidity ADC value. * * @return uint32_t calculated humidity. */ uint32_t calcHumidity(uint16_t hum_adc); /*! * @brief This internal API is used to calculate the Gas Resistance value. * * @param[in] gas_res_adc :Contains the Gas Resistance ADC value. * @param[in] gas_range :Contains the range of gas values. * * @return uint32_t calculated gas resistance. */ uint32_t calcGasResistance(uint16_t gas_res_adc, uint8_t gas_range); /*! * @brief This internal API is used to calculate the Heat Resistance value. * * @param[in] temp : Contains the target temperature value. * * @return uint8_t calculated heater resistance. */ uint8_t calcHeaterRes(uint16_t temp); #else /*! * @brief This internal API is used to calculate the * temperature value value in float format * * @param[in] temp_adc :Contains the temperature ADC value . * * @return Calculated temperature in float */ float calcTemperature(uint32_t temp_adc); /*! * @brief This internal API is used to calculate the * pressure value value in float format * * @param[in] pres_adc :Contains the pressure ADC value . * * @return Calculated pressure in float. */ float calcPressure(uint32_t pres_adc); /*! * @brief This internal API is used to calculate the * humidity value value in float format * * @param[in] hum_adc :Contains the humidity ADC value. * * @return Calculated humidity in float. */ float calcHumidity(uint16_t hum_adc); /*! * @brief This internal API is used to calculate the * gas resistance value value in float format * * @param[in] gas_res_adc :Contains the Gas Resistance ADC value. * @param[in] gas_range :Contains the range of gas values. * * @return Calculated gas resistance in float. */ float calcGasResistance(uint16_t gas_res_adc, uint8_t gas_range); /*! * @brief This internal API is used to calculate the * heater resistance value in float format * * @param[in] temp : Contains the target temperature value. * * @return Calculated heater resistance in float. */ float calcHeaterRes(uint16_t temp); #endif /*! * @brief This internal API is used to calculate the field data of sensor. * * @param[out] data :Structure instance to hold the data * * @return int8_t result of the field data from sensor. */ int8_t readFieldData(struct bme680_field_data *data); /*! * @brief This internal API is used to set the memory page * based on register address. * * The value of memory page * value | Description * --------|-------------- * 0 | BME680_PAGE0_SPI * 1 | BME680_PAGE1_SPI * * @param[in] reg_addr :Contains the register address array. * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t setMemPage(uint8_t reg_addr); /*! * @brief This internal API is used to get the memory page based * on register address. * * The value of memory page * value | Description * --------|-------------- * 0 | BME680_PAGE0_SPI * 1 | BME680_PAGE1_SPI * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t getMemPage(); /*! * @brief This internal API is used to validate the device pointer for * null conditions. * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t nullPtrCheck(); /*! * @brief This internal API is used to check the boundary * conditions. * * @param[in] value :pointer to the value. * @param[in] min :minimum value. * @param[in] max :maximum value. * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t boundaryCheck(uint8_t *value, uint8_t min, uint8_t max); public: /*! SPI/I2C interface */ enum bme680_intf intf; /*! Sensor power modes */ uint8_t power_mode; /*! Sensor settings */ struct bme680_tph_sett tph_sett; /*! Gas Sensor settings */ struct bme680_gas_sett gas_sett; /*! Ambient temperature in Degree C */ int8_t amb_temp; /*! Bus read function pointer */ bme680_com_fptr_t read; /*! Bus write function pointer */ bme680_com_fptr_t write; /*! delay function pointer */ bme680_delay_fptr_t delay_ms; BME680(uint8_t const addr) : dev_id(addr) {} /*! * @brief This API is the entry point. * It reads the chip-id and calibration data from the sensor. * * @param[in,out] dev : Structure instance of bme680_dev * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t bme680_init(struct bme680_dev *dev); int8_t init(); /*! * @brief This API writes the given data to the register address Loading @@ -82,12 +325,11 @@ int8_t bme680_init(struct bme680_dev *dev); * @param[in] reg_data : Pointer to data buffer which is to be written * in the sensor. * @param[in] len : No of bytes of data to write.. * @param[in] dev : Structure instance of bme680_dev. * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t bme680_set_regs(const uint8_t *reg_addr, const uint8_t *reg_data, uint8_t len, struct bme680_dev *dev); int8_t setRegs(const uint8_t *reg_addr, const uint8_t *reg_data, uint8_t len); /*! * @brief This API reads the data from the given register address of the sensor. Loading @@ -95,27 +337,23 @@ int8_t bme680_set_regs(const uint8_t *reg_addr, const uint8_t *reg_data, uint8_t * @param[in] reg_addr : Register address from where the data to be read * @param[out] reg_data : Pointer to data buffer to store the read data. * @param[in] len : No of bytes of data to be read. * @param[in] dev : Structure instance of bme680_dev. * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t bme680_get_regs(uint8_t reg_addr, uint8_t *reg_data, uint16_t len, struct bme680_dev *dev); int8_t getRegs(uint8_t reg_addr, uint8_t *reg_data, uint16_t len); /*! * @brief This API performs the soft reset of the sensor. * * @param[in] dev : Structure instance of bme680_dev. * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error. */ int8_t bme680_soft_reset(struct bme680_dev *dev); int8_t softReset(); /*! * @brief This API is used to set the power mode of the sensor. * * @param[in] dev : Structure instance of bme680_dev * @note : Pass the value to bme680_dev.power_mode structure variable. * * value | mode Loading @@ -126,12 +364,11 @@ int8_t bme680_soft_reset(struct bme680_dev *dev); * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t bme680_set_sensor_mode(struct bme680_dev *dev); int8_t setSensorMode(); /*! * @brief This API is used to get the power mode of the sensor. * * @param[in] dev : Structure instance of bme680_dev * @note : bme680_dev.power_mode structure variable hold the power mode. * * value | mode Loading @@ -142,27 +379,25 @@ int8_t bme680_set_sensor_mode(struct bme680_dev *dev); * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t bme680_get_sensor_mode(struct bme680_dev *dev); int8_t getSensorMode(); /*! * @brief This API is used to set the profile duration of the sensor. * * @param[in] dev : Structure instance of bme680_dev. * @param[in] duration : Duration of the measurement in ms. * * @return Nothing */ void bme680_set_profile_dur(uint16_t duration, struct bme680_dev *dev); void setProfileDur(uint16_t duration); /*! * @brief This API is used to get the profile duration of the sensor. * * @param[in] dev : Structure instance of bme680_dev. * @param[in] duration : Duration of the measurement in ms. * * @return Nothing */ void bme680_get_profile_dur(uint16_t *duration, const struct bme680_dev *dev); void getProfileDur(uint16_t *duration); /*! * @brief This API reads the pressure, temperature and humidity and gas data Loading @@ -170,18 +405,16 @@ void bme680_get_profile_dur(uint16_t *duration, const struct bme680_dev *dev); * structure instance passed by the user. * * @param[out] data: Structure instance to hold the data. * @param[in] dev : Structure instance of bme680_dev. * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error */ int8_t bme680_get_sensor_data(struct bme680_field_data *data, struct bme680_dev *dev); int8_t getSensorData(struct bme680_field_data *data); /*! * @brief This API is used to set the oversampling, filter and T,P,H, gas selection * settings in the sensor. * * @param[in] dev : Structure instance of bme680_dev. * @param[in] desired_settings : Variable used to select the settings which * are to be set in the sensor. * Loading @@ -204,22 +437,22 @@ int8_t bme680_get_sensor_data(struct bme680_field_data *data, struct bme680_dev * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error. */ int8_t bme680_set_sensor_settings(uint16_t desired_settings, struct bme680_dev *dev); int8_t setSensorSettings(uint16_t desired_settings); /*! * @brief This API is used to get the oversampling, filter and T,P,H, gas selection * settings in the sensor. * * @param[in] dev : Structure instance of bme680_dev. * @param[in] desired_settings : Variable used to select the settings which * are to be get from the sensor. * * @return Result of API execution status * @retval zero -> Success / +ve value -> Warning / -ve value -> Error. */ int8_t bme680_get_sensor_settings(uint16_t desired_settings, struct bme680_dev *dev); #ifdef __cplusplus } #endif /* End of CPP guard */ int8_t getSensorSettings(uint16_t desired_settings); }; extern BME680 bme680; #endif /* BME680_H_ */ /** @}*/
include/driver/bme680_defs.h +0 −36 Original line number Diff line number Diff line Loading @@ -502,42 +502,6 @@ struct bme680_gas_sett { uint16_t heatr_dur; }; /*! * @brief BME680 device structure */ struct bme680_dev { /*! Chip Id */ uint8_t chip_id; /*! Device Id */ uint8_t dev_id; /*! SPI/I2C interface */ enum bme680_intf intf; /*! Memory page used */ uint8_t mem_page; /*! Ambient temperature in Degree C */ int8_t amb_temp; /*! Sensor calibration data */ struct bme680_calib_data calib; /*! Sensor settings */ struct bme680_tph_sett tph_sett; /*! Gas Sensor settings */ struct bme680_gas_sett gas_sett; /*! Sensor power modes */ uint8_t power_mode; /*! New sensor fields */ uint8_t new_fields; /*! Store the info messages */ uint8_t info_msg; /*! Bus read function pointer */ bme680_com_fptr_t read; /*! Bus write function pointer */ bme680_com_fptr_t write; /*! delay function pointer */ bme680_delay_fptr_t delay_ms; /*! Communication function result */ int8_t com_rslt; }; #endif /* BME680_DEFS_H_ */ Loading
src/app/i2cdetect/main.cc +18 −21 Original line number Diff line number Diff line Loading @@ -47,35 +47,32 @@ void loop(void) } #endif #ifdef DRIVER_BME680 struct bme680_dev gas_sensor; gas_sensor.dev_id = BME680_I2C_ADDR_SECONDARY; gas_sensor.intf = BME680_I2C_INTF; gas_sensor.read = bme680_i2c_read; gas_sensor.write = bme680_i2c_write; gas_sensor.delay_ms = bme680_delay_ms; bme680.intf = BME680_I2C_INTF; bme680.read = bme680_i2c_read; bme680.write = bme680_i2c_write; bme680.delay_ms = bme680_delay_ms; /* amb_temp can be set to 25 prior to configuring the gas sensor * or by performing a few temperature readings without operating the gas sensor. */ gas_sensor.amb_temp = 25; bme680.amb_temp = 25; int8_t rslt = BME680_OK; rslt = bme680_init(&gas_sensor); rslt = bme680.init(); kout << "BME680 init " << rslt << endl; gas_sensor.power_mode = BME680_FORCED_MODE; gas_sensor.tph_sett.os_hum = BME680_OS_1X; gas_sensor.tph_sett.os_pres = BME680_OS_16X; gas_sensor.tph_sett.os_temp = BME680_OS_2X; gas_sensor.gas_sett.run_gas = BME680_ENABLE_GAS_MEAS; gas_sensor.gas_sett.heatr_dur = 150; gas_sensor.gas_sett.heatr_temp = 300; bme680_set_sensor_settings(BME680_OST_SEL | BME680_OSP_SEL | BME680_OSH_SEL | BME680_GAS_SENSOR_SEL, &gas_sensor); bme680_set_sensor_mode(&gas_sensor); arch.delay_ms(500); bme680.power_mode = BME680_FORCED_MODE; bme680.tph_sett.os_hum = BME680_OS_1X; bme680.tph_sett.os_pres = BME680_OS_16X; bme680.tph_sett.os_temp = BME680_OS_2X; bme680.gas_sett.run_gas = BME680_ENABLE_GAS_MEAS; bme680.gas_sett.heatr_dur = 30; bme680.gas_sett.heatr_temp = 300; bme680.setSensorSettings(BME680_OST_SEL | BME680_OSP_SEL | BME680_OSH_SEL | BME680_GAS_SENSOR_SEL); bme680.setSensorMode(); arch.delay_ms(200); struct bme680_field_data data; bme680_get_sensor_data(&data, &gas_sensor); bme680.getSensorData(&data); kout << "BME680 temperature " << (float)data.temperature / 100 << " degC" << endl; kout << "BME680 humidity " << (float)data.humidity / 1000 << " %" << endl; kout << "BME680 pressure " << (float)data.pressure / 100 << " hPa" << endl; Loading
src/driver/bme680.cc +243 −471 File changed.Preview size limit exceeded, changes collapsed. Show changes
