fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-05 01:01:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

ms5611: report P and T in ms5611 info

Browse Source
This commit is contained in:
Andrew Tridgell
2014-01-07 09:34:32 +01:00
committed by Lorenz Meier
parent 3be1a5182d
commit d6088efd34
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/ms5611/ms5611.cpp
+6
View File
@@ -124,6 +124,8 @@ protected:
int32_t _TEMP; int32_t _TEMP;
int64_t _OFF; int64_t _OFF;
int64_t _SENS; int64_t _SENS;
float _P;
float _T;
/* altitude conversion calibration */ /* altitude conversion calibration */
unsigned _msl_pressure; /* in kPa */ unsigned _msl_pressure; /* in kPa */
@@ -623,6 +625,8 @@ MS5611::collect()
/* pressure calculation, result in Pa */ /* pressure calculation, result in Pa */
int32_t P = (((raw * _SENS) >> 21) - _OFF) >> 15; int32_t P = (((raw * _SENS) >> 21) - _OFF) >> 15;
_P = P * 0.01f;
_T = _TEMP * 0.01f;
/* generate a new report */ /* generate a new report */
report.temperature = _TEMP / 100.0f; report.temperature = _TEMP / 100.0f;
@@ -695,6 +699,8 @@ MS5611::print_info()
printf("TEMP: %d\n", _TEMP); printf("TEMP: %d\n", _TEMP);
printf("SENS: %lld\n", _SENS); printf("SENS: %lld\n", _SENS);
printf("OFF: %lld\n", _OFF); printf("OFF: %lld\n", _OFF);
printf("P: %.3f\n", _P);
printf("T: %.3f\n", _T);
printf("MSL pressure: %10.4f\n", (double)(_msl_pressure / 100.f)); printf("MSL pressure: %10.4f\n", (double)(_msl_pressure / 100.f));
printf("factory_setup %u\n", _prom.factory_setup); printf("factory_setup %u\n", _prom.factory_setup);