From 578ddd16ce71bbc15457ca7fcc24d7fff4c81b1c Mon Sep 17 00:00:00 2001
From: Mark Haslinghuis <mark@numloq.nl>
Date: Fri, 17 Jan 2025 12:38:09 +0100
Subject: [PATCH] Refactor compass align defines (#14159)

* Remove unused compass align defines

* Use ALIGN_DEFAULT

* Use single define for custom alignment

* Unify custom alignment
---
 src/main/sensors/compass.c | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/src/main/sensors/compass.c b/src/main/sensors/compass.c
index e5f5c9332f..4a1bfc99d3 100644
--- a/src/main/sensors/compass.c
+++ b/src/main/sensors/compass.c
@@ -158,7 +158,11 @@ void compassPreInit(void)
 #if !defined(SIMULATOR_BUILD)
 bool compassDetect(magDev_t *magDev, uint8_t *alignment)
 {
-    *alignment = ALIGN_DEFAULT;  // may be overridden if target specifies MAG_*_ALIGN
+#ifdef MAG_ALIGN
+    *alignment = MAG_ALIGN;
+#else
+    *alignment = ALIGN_DEFAULT;
+#endif
 
     magSensor_e magHardware = MAG_NONE;
 
@@ -221,9 +225,6 @@ bool compassDetect(magDev_t *magDev, uint8_t *alignment)
         }
 
         if (hmc5883lDetect(magDev)) {
-#ifdef MAG_HMC5883_ALIGN
-            *alignment = MAG_HMC5883_ALIGN;
-#endif
             magHardware = MAG_HMC5883;
             break;
         }
@@ -237,9 +238,6 @@ bool compassDetect(magDev_t *magDev, uint8_t *alignment)
         }
 
         if (lis2mdlDetect(magDev)) {
-#ifdef MAG_LIS2MDL_ALIGN
-            *alignment = MAG_LIS2MDL_ALIGN;
-#endif
             magHardware = MAG_LIS2MDL;
             break;
         }
@@ -253,9 +251,6 @@ bool compassDetect(magDev_t *magDev, uint8_t *alignment)
         }
 
         if (lis3mdlDetect(magDev)) {
-#ifdef MAG_LIS3MDL_ALIGN
-            *alignment = MAG_LIS3MDL_ALIGN;
-#endif
             magHardware = MAG_LIS3MDL;
             break;
         }
@@ -269,9 +264,6 @@ bool compassDetect(magDev_t *magDev, uint8_t *alignment)
         }
 
         if (ak8975Detect(magDev)) {
-#ifdef MAG_AK8975_ALIGN
-            *alignment = MAG_AK8975_ALIGN;
-#endif
             magHardware = MAG_AK8975;
             break;
         }
@@ -290,9 +282,6 @@ bool compassDetect(magDev_t *magDev, uint8_t *alignment)
         }
 
         if (ak8963Detect(magDev)) {
-#ifdef MAG_AK8963_ALIGN
-            *alignment = MAG_AK8963_ALIGN;
-#endif
             magHardware = MAG_AK8963;
             break;
         }
@@ -306,9 +295,6 @@ bool compassDetect(magDev_t *magDev, uint8_t *alignment)
         }
 
         if (qmc5883lDetect(magDev)) {
-#ifdef MAG_QMC5883L_ALIGN
-            *alignment = MAG_QMC5883L_ALIGN;
-#endif
             magHardware = MAG_QMC5883;
             break;
         }
@@ -322,9 +308,6 @@ bool compassDetect(magDev_t *magDev, uint8_t *alignment)
         }
 
         if (ist8310Detect(magDev)) {
-#ifdef MAG_IST8310_ALIGN
-            *alignment = MAG_IST8310_ALIGN;
-#endif
             magHardware = MAG_IST8310;
             break;
         }