yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

lis3mdl : correct offset and scale checks

Browse Source
This commit is contained in:
klopezal
2017-02-08 09:57:20 +01:00
committed by Lorenz Meier
parent 1167fba9ad
commit b5858e729c
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/drivers/lis3mdl/lis3mdl.cpp
View File

@@ -1182,38 +1182,38 @@ out:
int LIS3MDL::check_scale()
{
int scale_valid;
bool scale_valid;
if ((-FLT_EPSILON + 1.0f < _scale.x_scale && _scale.x_scale < FLT_EPSILON + 1.0f) &&
(-FLT_EPSILON + 1.0f < _scale.y_scale && _scale.y_scale < FLT_EPSILON + 1.0f) &&
(-FLT_EPSILON + 1.0f < _scale.z_scale && _scale.z_scale < FLT_EPSILON + 1.0f)) {
/* scale is one */
scale_valid = 0;
scale_valid = false;
} else {
scale_valid = 1;
scale_valid = true;
}
/* return 0 if calibrated, 1 else */
return scale_valid;
return !scale_valid;
}
int LIS3MDL::check_offset()
{
int offset_valid;
bool offset_valid;
if ((-0.6f < _scale.x_offset && _scale.x_offset < 0.6f) &&
(-0.6f < _scale.y_offset && _scale.y_offset < 0.6f) &&
(-0.6f < _scale.z_offset && _scale.z_offset < 0.6f)) {
if ((-2.0f * FLT_EPSILON < _scale.x_offset && _scale.x_offset < 2.0f * FLT_EPSILON) &&
(-2.0f * FLT_EPSILON < _scale.y_offset && _scale.y_offset < 2.0f * FLT_EPSILON) &&
(-2.0f * FLT_EPSILON < _scale.z_offset && _scale.z_offset < 2.0f * FLT_EPSILON)) {
/* offset is zero */
offset_valid = 0;
offset_valid = false;
} else {
offset_valid = 1;
offset_valid = true;
}
/* return 0 if calibrated, 1 else */
return offset_valid;
return !offset_valid;
}
int LIS3MDL::check_calibration()