Merge pull request #53 from jnslr/master

change byte to uint8_t to avoid naming conflict with ESP8266 toolchain
sparkfun · May 9, 2022 · 8806f66 · 8806f66
2 parents 0b5eabf + 55768be
commit 8806f66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/SparkFunBME280.cpp b/src/SparkFunBME280.cpp
@@ -366,7 +366,7 @@ void BME280::reset( void )
 //Read all sensor registers as a burst. See BME280 Datasheet section 4. Data readout
 //tempScale = 0 for Celsius scale (default setting)
 //tempScale = 1 for Fahrenheit scale
-void BME280::readAllMeasurements(BME280_SensorMeasurements *measurements, byte tempScale){
+void BME280::readAllMeasurements(BME280_SensorMeasurements *measurements, uint8_t tempScale){
 
 	uint8_t dataBurst[8];
 	readRegisterRegion(dataBurst, BME280_MEASUREMENTS_REG, 8);

diff --git a/src/SparkFunBME280.h b/src/SparkFunBME280.h
@@ -224,7 +224,7 @@ class BME280
 
 	//Software reset routine
 	void reset( void );
-		void readAllMeasurements(BME280_SensorMeasurements *measurements, byte tempScale = 0);
+	void readAllMeasurements(BME280_SensorMeasurements *measurements, uint8_t tempScale = 0);
 
     //Returns the values as floats.
     float readFloatPressure( void );