diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-12-09 19:19:59 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-12-09 19:19:59 +0100 |
| commit | 26faab64e5e1679d15afe88ef0edebd598f47dc7 (patch) | |
| tree | 9e1a63c80321ccaa4604e6e279bd337cae6e0bc2 /apps/drivers | |
| parent | 1ebb3b4ada6bdf2109f3e6bb45800f0459b35ccc (diff) | |
| parent | 154035279fbfbe14be208d5ec957089f11f6447d (diff) | |
| download | px4-firmware-26faab64e5e1679d15afe88ef0edebd598f47dc7.tar.gz px4-firmware-26faab64e5e1679d15afe88ef0edebd598f47dc7.tar.bz2 px4-firmware-26faab64e5e1679d15afe88ef0edebd598f47dc7.zip | |
Merge branch 'master' of github.com:PX4/Firmware into fixedwing_outdoor
Diffstat (limited to 'apps/drivers')
| -rw-r--r-- | apps/drivers/hmc5883/hmc5883.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/drivers/hmc5883/hmc5883.cpp b/apps/drivers/hmc5883/hmc5883.cpp index 5d928264d..3734d7755 100644 --- a/apps/drivers/hmc5883/hmc5883.cpp +++ b/apps/drivers/hmc5883/hmc5883.cpp @@ -1080,10 +1080,10 @@ int HMC5883::check_offset() int HMC5883::check_calibration() { - bool offset_valid = !(check_offset() == OK); - bool scale_valid = !(check_scale() == OK); + bool offset_valid = (check_offset() == OK); + bool scale_valid = (check_scale() == OK); - if (_calibrated != (offset_valid && scale_valid == OK)) { + if (_calibrated != (offset_valid && scale_valid)) { warnx("mag cal status changed %s%s", (scale_valid) ? "" : "scale invalid ", (offset_valid) ? "" : "offset invalid"); _calibrated = (offset_valid && scale_valid); |