baro
Fork of MS5611 by
Revision 1:8ebf0430f788, committed 2014-01-17
- Comitter:
- hiltontnunay
- Date:
- Fri Jan 17 13:45:43 2014 +0000
- Parent:
- 0:669dfadf96c5
- Commit message:
- ms5611
Changed in this revision
MS5611.cpp | Show annotated file Show diff for this revision Revisions of this file |
MS5611.h | Show annotated file Show diff for this revision Revisions of this file |
diff -r 669dfadf96c5 -r 8ebf0430f788 MS5611.cpp --- a/MS5611.cpp Sat Dec 14 04:19:18 2013 +0000 +++ b/MS5611.cpp Fri Jan 17 13:45:43 2014 +0000 @@ -39,7 +39,7 @@ * @brief Get temperature * @return temperature (`C) */ -float MS5611::get_temperature() { +float MS5611::getTemperature() { return temperature; } @@ -47,7 +47,7 @@ * @brief Get pressure * @return pressure (hPa) */ -float MS5611::get_pressure() { +float MS5611::getPressure() { return pressure; }
diff -r 669dfadf96c5 -r 8ebf0430f788 MS5611.h --- a/MS5611.h Sat Dec 14 04:19:18 2013 +0000 +++ b/MS5611.h Fri Jan 17 13:45:43 2014 +0000 @@ -34,11 +34,11 @@ MS5611(PinName p_sda, PinName p_scl, MS5611_oss p_oss = MS5611_oss1); MS5611(I2C& p_i2c, MS5611_oss p_oss = MS5611_oss1); - float get_temperature(); - float get_pressure(); + float getTemperature(); + float getPressure(); void update(); -protected: +//protected: void init(MS5611_oss); unsigned short twi_readshort (int, int); unsigned long twi_readlong (int, int);