From 5a50f96bcfb6261382348a43c0c92875de6eb1d6 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Thu, 11 Apr 2019 11:15:53 -0400
Subject: [PATCH] move icm20948 (Here GPS compass) to Cube sensors start
 (#11838)

---
 ROMFS/px4fmu_common/init.d/rc.sensors   | 3 ---
 boards/px4/fmu-v3/init/rc.board_sensors | 3 +++
 boards/px4/fmu-v5/default.cmake         | 1 -
 boards/px4/fmu-v5/rtps.cmake            | 1 -
 boards/px4/fmu-v5/stackcheck.cmake      | 1 -
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/ROMFS/px4fmu_common/init.d/rc.sensors b/ROMFS/px4fmu_common/init.d/rc.sensors
index f914f48912..4fb48e95da 100644
--- a/ROMFS/px4fmu_common/init.d/rc.sensors
+++ b/ROMFS/px4fmu_common/init.d/rc.sensors
@@ -105,9 +105,6 @@ then
 	teraranger start -a
 fi
 
-# ICM20948 as external magnetometer on I2C (e.g. Here GPS)
-icm20948 -X -M -R 6 start
-
 ###############################################################################
 #                            End Optional drivers                             #
 ###############################################################################
diff --git a/boards/px4/fmu-v3/init/rc.board_sensors b/boards/px4/fmu-v3/init/rc.board_sensors
index c42103f7d4..0cabab7d28 100644
--- a/boards/px4/fmu-v3/init/rc.board_sensors
+++ b/boards/px4/fmu-v3/init/rc.board_sensors
@@ -59,6 +59,9 @@ then
 	# sensor heating is available, but we disable it for now
 	param set SENS_EN_THERMAL 0
 
+	# ICM20948 as external magnetometer on I2C (e.g. Here GPS)
+	icm20948 -X -M -R 6 start
+
 	# external L3GD20H is rotated 180 degrees yaw
 	l3gd20 -X -R 4 start
 
diff --git a/boards/px4/fmu-v5/default.cmake b/boards/px4/fmu-v5/default.cmake
index 7911119cd8..56203b6961 100644
--- a/boards/px4/fmu-v5/default.cmake
+++ b/boards/px4/fmu-v5/default.cmake
@@ -30,7 +30,6 @@ px4_add_board(
 		imu/adis16497
 		#imu # all available imu drivers
 		imu/bmi055
-		imu/icm20948
 		imu/mpu6000
 		imu/mpu9250
 		irlock
diff --git a/boards/px4/fmu-v5/rtps.cmake b/boards/px4/fmu-v5/rtps.cmake
index 27919988a6..57660e82e9 100644
--- a/boards/px4/fmu-v5/rtps.cmake
+++ b/boards/px4/fmu-v5/rtps.cmake
@@ -29,7 +29,6 @@ px4_add_board(
 		imu/adis16448
 		#imu # all available imu drivers
 		imu/bmi055
-		imu/icm20948
 		imu/mpu6000
 		imu/mpu9250
 		irlock
diff --git a/boards/px4/fmu-v5/stackcheck.cmake b/boards/px4/fmu-v5/stackcheck.cmake
index 8bdf660c17..85ac683482 100644
--- a/boards/px4/fmu-v5/stackcheck.cmake
+++ b/boards/px4/fmu-v5/stackcheck.cmake
@@ -29,7 +29,6 @@ px4_add_board(
 		imu/adis16448
 		#imu # all available imu drivers
 		imu/bmi055
-		imu/icm20948
 		imu/mpu6000
 		imu/mpu9250
 		#irlock
-- 
GitLab