Skip to content

Changed variable name struct SensorSettings -> BME280_SensorSettings #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/SparkFunBME280.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ BME280::BME280( void )
//
// Configuration section
//
// This uses the stored SensorSettings to start the IMU
// This uses the stored BME280_SensorSettings to start the IMU
// Use statements such as "mySensor.settings.commInterface = SPI_MODE;" to
// configure before calling .begin();
//
Expand Down
12 changes: 6 additions & 6 deletions src/SparkFunBME280.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,17 +102,17 @@ Distributed as-is; no warranty is given.
#define BME280_HUMIDITY_MSB_REG 0xFD //Humidity MSB
#define BME280_HUMIDITY_LSB_REG 0xFE //Humidity LSB

//Class SensorSettings. This object is used to hold settings data. The application
//Class BME280_SensorSettings. This object is used to hold settings data. The application
//uses this classes' data directly. The settings are adopted and sent to the sensor
//at special times, such as .begin. Some are used for doing math.
//
//This is a kind of bloated way to do this. The trade-off is that the user doesn't
//need to deal with #defines or enums with bizarre names.
//
//A power user would strip out SensorSettings entirely, and send specific read and
//A power user would strip out BME280_SensorSettings entirely, and send specific read and
//write command directly to the IC. (ST #defines below)
//
struct SensorSettings
struct BME280_SensorSettings
{
public:

Expand Down Expand Up @@ -165,16 +165,16 @@ class BME280
{
public:
//settings
SensorSettings settings;
BME280_SensorSettings settings;
SensorCalibration calibration;
int32_t t_fine;

//Constructor generates default SensorSettings.
//Constructor generates default BME280_SensorSettings.
//(over-ride after construction if desired)
BME280( void );
//~BME280() = default;

//Call to apply SensorSettings.
//Call to apply BME280_SensorSettings.
//This also gets the SensorCalibration constants
uint8_t begin( void );
bool beginSPI(uint8_t csPin); //Communicate using SPI
Expand Down