From 588195f46c2142a674072148bf21557c4cb13b5c Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Mon, 13 Apr 2020 14:52:32 -0400
Subject: [PATCH] boards: px4/fmu-v4pro cleanup rc.board_sensors

 - board has either an icm20602 or icm20608g, not both
 - probe all typical externally compasses
---
 boards/px4/fmu-v4pro/init/rc.board_sensors | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/boards/px4/fmu-v4pro/init/rc.board_sensors b/boards/px4/fmu-v4pro/init/rc.board_sensors
index 1c5ed3822cd7..e45015c342b0 100644
--- a/boards/px4/fmu-v4pro/init/rc.board_sensors
+++ b/boards/px4/fmu-v4pro/init/rc.board_sensors
@@ -7,11 +7,11 @@ rgbled start -I
 
 adc start
 
-# Internal SPI bus ICM-20608-G
-icm20608g -s -R 8 start
-
-# Internal SPI bus ICM-20602
-icm20602 -s -R 8 start
+# Internal SPI bus ICM-20602 or ICM-20608-G
+if ! icm20602 -s -R 8 start
+then
+	icm20608g -s -R 8 start
+fi
 
 # Internal SPI bus mpu9250
 mpu9250 -s -R 8 start
@@ -19,12 +19,12 @@ mpu9250 -s -R 8 start
 # Internal SPI bus
 lis3mdl -s -R 0 start
 
+# Internal SPI
+ms5611 -s start
+
 # Possible external compasses
 hmc5883 -T -X start
+lis3mdl -X start
+ist8310 -X start
 qmc5883 -X start
-
-# RM3100
 rm3100 -X start
-
-# Internal SPI
-ms5611 -s start