fix compilation without ACC (betaflight#14218)

* fix compilation without ACC - compilatiopn may fail with cryptic message when no ACC is selected (unused variable `dev`). Mark dev as unused - MPU6500 is handled differently than all other accs (it is only driver that adds case labels) - also make dev UNUSED for gyro * Update src/main/sensors/acceleration_init.c --------- Co-authored-by: Mark Haslinghuis <[email protected]>
haslinghuis · Feb 1, 2025 · e7f0486 · e7f0486
1 parent 79ecc1a
commit e7f0486
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/sensors/acceleration_init.c b/src/main/sensors/acceleration_init.c
@@ -167,11 +167,11 @@ static bool accDetect(accDev_t *dev, accelerationSensor_e accHardwareToUse)
         FALLTHROUGH;
 #endif
 
+#if defined(USE_ACC_MPU6500) || defined(USE_ACC_SPI_MPU6500)
     case ACC_MPU6500:
     case ACC_ICM20601:
     case ACC_ICM20602:
     case ACC_ICM20608G:
-#if defined(USE_ACC_MPU6500) || defined(USE_ACC_SPI_MPU6500)
 #ifdef USE_ACC_SPI_MPU6500
         if (mpu6500SpiAccDetect(dev)) {
 #else
@@ -195,8 +195,8 @@ static bool accDetect(accDev_t *dev, accelerationSensor_e accHardwareToUse)
             }
             break;
         }
-#endif
         FALLTHROUGH;
+#endif
 
 #ifdef USE_ACC_SPI_ICM20649
     case ACC_ICM20649:
@@ -287,6 +287,7 @@ static bool accDetect(accDev_t *dev, accelerationSensor_e accHardwareToUse)
 
     default:
     case ACC_NONE: // disable ACC
+        UNUSED(dev);
         accHardware = ACC_NONE;
         break;
     }

diff --git a/src/main/sensors/gyro_init.c b/src/main/sensors/gyro_init.c
@@ -500,6 +500,7 @@ STATIC_UNIT_TESTED gyroHardware_e gyroDetect(gyroDev_t *dev)
 #endif
 
     default:
+        UNUSED(dev);
         gyroHardware = GYRO_NONE;
     }
-Original file line number
+Diff line change
@@ Expand Up @@
     #endif
         default:
+            UNUSED(dev);
             gyroHardware = GYRO_NONE;
         }
@@ Expand Down @@