Make some code-style fixes

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
 )

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;
 }