From 23d8b3cf25454884d2c872e12456d674c6ccf796 Mon Sep 17 00:00:00 2001
From: David Sidrane <David.Sidrane@NscDg.com>
Date: Mon, 15 Jan 2024 08:24:31 -0800
Subject: [PATCH] px4_fmu-v6x:rc.board_sensors Use
 BOARD_HAS_HW_SPLIT_VERSIONING

---
 boards/px4/fmu-v6x/init/rc.board_sensors | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/boards/px4/fmu-v6x/init/rc.board_sensors b/boards/px4/fmu-v6x/init/rc.board_sensors
index 57b33e50c1..475815f8e8 100644
--- a/boards/px4/fmu-v6x/init/rc.board_sensors
+++ b/boards/px4/fmu-v6x/init/rc.board_sensors
@@ -48,25 +48,25 @@ then
 fi
 
 
-if ver hwtypecmp V6X000006 V6X004006 V6X005006
+if ver hwtypecmp V6X006
 then
 	# Internal SPI bus ICM45686
 	icm45686 -s -R 10 start
 	iim42652 -s -R 6 start
 	adis16470 -s -R 0 start
 else
-	if ver hwtypecmp V6X000004 V6X001004 V6X004004 V6X005004
+	if ver hwtypecmp V6X004
 	then
 		# Internal SPI bus ICM20649
 		icm20649 -s -R 6 start
 	else
 		# Internal SPI BMI088
-		if ver hwtypecmp V6X009010 V6X010010
+		if ver hwbasecmp 009 010
 		then
 			bmi088 -A -R 6 -s start
 			bmi088 -G -R 6 -s start
 		else
-			if ver hwtypecmp V6X000010
+			if ver hwtypecmp V6X010
 			then
 				bmi088 -A -R 0 -s start
 				bmi088 -G -R 0 -s start
@@ -78,11 +78,11 @@ else
 	fi
 
 	# Internal SPI bus ICM42688p
-	if ver hwtypecmp V6X009010 V6X010010
+	if ver hwbasecmp 009 010
 	then
 		icm42688p -R 12 -s start
 	else
-		if ver hwtypecmp V6X000010
+		if ver hwtypecmp V6X010
 		then
 			icm42688p -R 14 -s start
 		else
@@ -90,12 +90,12 @@ else
 		fi
 	fi
 
-	if ver hwtypecmp V6X000003 V6X001003 V6X003003 V6X000004 V6X001004 V6X004003 V6X004004 V6X005003 V6X005004
+	if ver hwtypecmp V6X003 V6X004
 	then
 		# Internal SPI bus ICM-42670-P (hard-mounted)
 		icm42670p -R 10 -s start
 	else
-		if ver hwtypecmp V6X009010 V6X010010
+		if ver hwbasecmp 009 010
 		then
 			icm20602 -R 6 -s start
 		else
@@ -106,7 +106,7 @@ else
 fi
 
 # Internal magnetometer on I2c
-if ver hwtypecmp V6X002001
+if ver hwtypecmp V6X001
 then
 	rm3100 -I -b 4 start
 else
@@ -120,7 +120,7 @@ ist8310 -X -b 1 -R 10 start
 # Possible internal Baro
 if param compare SENS_INT_BARO_EN 1
 then
-	if ver hwtypecmp V6X002001 V6X000006 V6X004006 V6X005006
+	if ver hwtypecmp V6X001 V6X006
 	then
 		icp201xx -I -a 0x64 start
 	else
@@ -129,7 +129,7 @@ then
 fi
 
 #external baro
-if ver hwtypecmp V6X002001
+if ver hwtypecmp V6X001
 then
 	icp201xx -X start
 else