Merge pull request #34 from calvin1564/master

Changed variable name struct SensorSettings -> BME280_SensorSettings

Author: nseidle

src/SparkFunBME280.cpp

@@ -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();
 //

src/SparkFunBME280.h

@@ -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:
 
@@ -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