diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-20 15:43:17 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-08-20 15:43:17 +0200 |
| commit | 56ec0523468b5884a56613ad0724e1feeea29fb3 (patch) | |
| tree | cc76cde3a1ef02fcdf58606d15f57ae085c49dce /src/drivers | |
| parent | 7dc595167391d00a4615cefb6d46990352147da1 (diff) | |
| parent | 86ae2e489fdd3656faa38202f44e4b53342e450b (diff) | |
| download | px4-firmware-56ec0523468b5884a56613ad0724e1feeea29fb3.tar.gz px4-firmware-56ec0523468b5884a56613ad0724e1feeea29fb3.tar.bz2 px4-firmware-56ec0523468b5884a56613ad0724e1feeea29fb3.zip | |
Merge pull request #1283 from PX4/qnh
add param for qnh
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/ms5611/ms5611.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/ms5611/ms5611.cpp b/src/drivers/ms5611/ms5611.cpp index 873fa62c4..889643d0d 100644 --- a/src/drivers/ms5611/ms5611.cpp +++ b/src/drivers/ms5611/ms5611.cpp @@ -130,7 +130,7 @@ protected: float _T; /* altitude conversion calibration */ - unsigned _msl_pressure; /* in kPa */ + unsigned _msl_pressure; /* in Pa */ orb_advert_t _baro_topic; @@ -466,7 +466,7 @@ MS5611::ioctl(struct file *filp, int cmd, unsigned long arg) irqrestore(flags); return -ENOMEM; } - irqrestore(flags); + irqrestore(flags); return OK; } |