Skip to content

Commit fa315c4

Browse files
authored
Merge pull request #34 from calvin1564/master
Changed variable name struct SensorSettings -> BME280_SensorSettings
2 parents 41f3033 + 4e920f9 commit fa315c4

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/SparkFunBME280.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ BME280::BME280( void )
5555
//
5656
// Configuration section
5757
//
58-
// This uses the stored SensorSettings to start the IMU
58+
// This uses the stored BME280_SensorSettings to start the IMU
5959
// Use statements such as "mySensor.settings.commInterface = SPI_MODE;" to
6060
// configure before calling .begin();
6161
//

src/SparkFunBME280.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,17 @@ Distributed as-is; no warranty is given.
102102
#define BME280_HUMIDITY_MSB_REG 0xFD //Humidity MSB
103103
#define BME280_HUMIDITY_LSB_REG 0xFE //Humidity LSB
104104

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

@@ -165,16 +165,16 @@ class BME280
165165
{
166166
public:
167167
//settings
168-
SensorSettings settings;
168+
BME280_SensorSettings settings;
169169
SensorCalibration calibration;
170170
int32_t t_fine;
171171

172-
//Constructor generates default SensorSettings.
172+
//Constructor generates default BME280_SensorSettings.
173173
//(over-ride after construction if desired)
174174
BME280( void );
175175
//~BME280() = default;
176176

177-
//Call to apply SensorSettings.
177+
//Call to apply BME280_SensorSettings.
178178
//This also gets the SensorCalibration constants
179179
uint8_t begin( void );
180180
bool beginSPI(uint8_t csPin); //Communicate using SPI

0 commit comments

Comments
 (0)