Skip to content

Make getMeasurements public and allow to get both data at the same time #8

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.

Sign up for GitHub

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

Open
cyrilMargaria wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make getMeasurements public and allow to get both data at the same time #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 15 additions & 20 deletions src/MS5803.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,36 +141,22 @@ uint8_t MS5803::begin(uint8_t address, int MaxPressure)
float MS5803::getTemperature(temperature_units units, precision _precision)
// Return a temperature reading in either F or C.
{
getMeasurements(_precision);
float temperature_reported;
// If Fahrenheit is selected return the temperature converted to F
if(units == FAHRENHEIT){
temperature_reported = _temperature_actual / 100.0f;
temperature_reported = (((temperature_reported) * 9) / 5) + 32;
return temperature_reported;
}

// If Celsius is selected return the temperature converted to C
else {
temperature_reported = _temperature_actual / 100.0f;
return temperature_reported;
}
float temperature_reported, pressure_reported;
getMeasurements(_precision, units, temperature_reported, pressure_reported);
return temperature_reported;
}


float MS5803::getPressure(precision _precision)
// Return a pressure reading units Pa.
{
getMeasurements(_precision);
float pressure_reported;
pressure_reported = _pressure_actual;
// pressure_reported = pressure_reported / 10;
pressure_reported = pressure_reported / (float(ConvCoef[4])/100.0); //05BA model!
float temperature_reported, pressure_reported;
getMeasurements(_precision, CELSIUS, temperature_reported, pressure_reported);
return pressure_reported;
}


void MS5803::getMeasurements(precision _precision)
void MS5803::getMeasurements(precision _precision, temperature_units units, float &temperature_reported, float &pressure_reported)
// Gets resuts from ADC and stores them into internal variables
{
//Retrieve ADC result
Expand Down Expand Up @@ -236,6 +222,15 @@ void MS5803::getMeasurements(precision _precision)

_temperature_actual = temp_calc ;
_pressure_actual = pressure_calc ; // 10;// pressure_calc;
// default: Celsius
temperature_reported = _temperature_actual / 100.0f;
// If Fahrenheit is selected return the temperature converted to F
if(units == FAHRENHEIT){
temperature_reported = (((temperature_reported) * 9) / 5) + 32;
}
pressure_reported = _pressure_actual;
pressure_reported = pressure_reported / (float(ConvCoef[4])/100.0); //05BA model!

}


Expand Down
5 changes: 4 additions & 1 deletion src/MS5803.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ class MS5803
// Return calculated pressure from sensor
float getPressure(precision _precision);

// get the temperature and pressure
void getMeasurements(precision _precision, temperature_units units, float &temperature, float &pressure);


private:
int Model;
int32_t _temperature_actual;
Expand All @@ -84,7 +88,6 @@ class MS5803
uint16_t coefficient[8];// Coefficients;
uint16_t ConvCoef[16]; //Coefficients for data conversion

void getMeasurements(precision _precision);

void sendCommand(uint8_t command); // General I2C send command function
uint32_t getADCconversion(measurement _measurement, precision _precision); // Retrieve ADC result
Expand Down