diff options
| author | px4dev <px4@purgatory.org> | 2012-12-19 22:24:00 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2012-12-19 22:24:00 -0800 |
| commit | 73763353d094e151dc95bc827a1bb4da84939ed0 (patch) | |
| tree | 875e5a75195ebe1251f38f98c201b9f1cf6cbbbc /apps/drivers | |
| parent | fd771f67f2a2392d5ba2b7dd74100338859af6d7 (diff) | |
| parent | f40e4d13aa1c6cd854b848f1cd0c3a017e719138 (diff) | |
| download | px4-firmware-73763353d094e151dc95bc827a1bb4da84939ed0.tar.gz px4-firmware-73763353d094e151dc95bc827a1bb4da84939ed0.tar.bz2 px4-firmware-73763353d094e151dc95bc827a1bb4da84939ed0.zip | |
Merge branch 'master' into DSM-decoder-fix
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); |