From 8566cabd76c0f204cbd7299ef52da161b9b0864c Mon Sep 17 00:00:00 2001
From: Michael Schaeuble <schaeuble.michael@gmail.com>
Date: Wed, 3 Aug 2016 16:46:37 +0200
Subject: [PATCH] Make some code-style fixes
---
cmake/configs/posix_bebop_default.cmake | 4 +---
.../posix/drivers/df_ak8963_wrapper/df_ak8963_wrapper.cpp | 8 ++++----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/cmake/configs/posix_bebop_default.cmake b/cmake/configs/posix_bebop_default.cmake
index a1c75d9565..5538ffe35a 100644
--- a/cmake/configs/posix_bebop_default.cmake
+++ b/cmake/configs/posix_bebop_default.cmake
@@ -23,11 +23,8 @@ set(config_module_list
drivers/device
modules/sensors
platforms/posix/drivers/df_ms5607_wrapper
-<<<<<<< c4eb65862f307de4b679e24f44fab0c565d7c2a3
platforms/posix/drivers/df_mpu6050_wrapper
-=======
platforms/posix/drivers/df_ak8963_wrapper
->>>>>>> Add DF wrapper for AK8963
#
# System commands
@@ -105,4 +102,5 @@ set(config_module_list
set(config_df_driver_list
ms5607
mpu6050
+ ak8963
)
diff --git a/src/platforms/posix/drivers/df_ak8963_wrapper/df_ak8963_wrapper.cpp b/src/platforms/posix/drivers/df_ak8963_wrapper/df_ak8963_wrapper.cpp
index 9238a5e7de..473a53e031 100644
--- a/src/platforms/posix/drivers/df_ak8963_wrapper/df_ak8963_wrapper.cpp
+++ b/src/platforms/posix/drivers/df_ak8963_wrapper/df_ak8963_wrapper.cpp
@@ -288,9 +288,9 @@ int DfAK8963Wrapper::_publish(struct mag_sensor_data &data)
// apply sensor rotation on the accel measurement
mag_val = _rotation_matrix * mag_val;
- mag_report.x = (mag_val(0) - _mag_calibration.x_offset) * _mag_calibration.x_scale;;
- mag_report.y = (mag_val(1) - _mag_calibration.y_offset) * _mag_calibration.y_scale;;
- mag_report.z = (mag_val(2) - _mag_calibration.z_offset) * _mag_calibration.z_scale;;
+ mag_report.x = (mag_val(0) - _mag_calibration.x_offset) * _mag_calibration.x_scale;
+ mag_report.y = (mag_val(1) - _mag_calibration.y_offset) * _mag_calibration.y_scale;
+ mag_report.z = (mag_val(2) - _mag_calibration.z_offset) * _mag_calibration.z_scale;
// TODO: get these right
@@ -394,7 +394,7 @@ info()
PX4_DEBUG("state @ %p", g_dev);
- g_dev->print_calibration();
+ g_dev->print_calibration();
return 0;
}
--
GitLab