FIX: Invalid references when neither DSHOT nor PWM_OUTPUT is defined. (…

…betaflight#14135)
haslinghuis · Jan 11, 2025 · c513b10 · c513b10
1 parent 07e4b4f
commit c513b10
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 12 deletions.
diff --git a/src/main/drivers/motor.c b/src/main/drivers/motor.c
@@ -317,26 +317,31 @@ bool isMotorProtocolBidirDshot(void)
 
 void motorDevInit(const motorDevConfig_t *motorDevConfig, uint16_t idlePulse, uint8_t motorCount)
 {
-    memset(motors, 0, sizeof(motors));
-
+#if defined(USE_PWM_OUTPUT) || defined(USE_DSHOT)
     bool useUnsyncedPwm = motorDevConfig->useUnsyncedPwm;
+#else
+    UNUSED(idlePulse);
+    UNUSED(motorDevConfig);
+#endif
 
     if (isMotorProtocolEnabled()) {
-        if (!isMotorProtocolDshot()) {
-            motorDevice = motorPwmDevInit(motorDevConfig, idlePulse, motorCount, useUnsyncedPwm);
-        }
+        do {
+            if (!isMotorProtocolDshot()) {
+#ifdef USE_PWM_OUTPUT
+                motorDevice = motorPwmDevInit(motorDevConfig, idlePulse, motorCount, useUnsyncedPwm);
+#endif
+                break;
+            }
 #ifdef USE_DSHOT
-        else {
 #ifdef USE_DSHOT_BITBANG
             if (isDshotBitbangActive(motorDevConfig)) {
                 motorDevice = dshotBitbangDevInit(motorDevConfig, motorCount);
-            } else
-#endif
-            {
-                motorDevice = dshotPwmDevInit(motorDevConfig, idlePulse, motorCount, useUnsyncedPwm);
+                break;
             }
-        }
 #endif
+            motorDevice = dshotPwmDevInit(motorDevConfig, idlePulse, motorCount, useUnsyncedPwm);
+#endif
+        } while(0);
     }
 
     if (motorDevice) {

diff --git a/src/platform/APM32/pwm_output_apm32.c b/src/platform/APM32/pwm_output_apm32.c
@@ -155,6 +155,8 @@ static motorVTable_t motorPwmVTable = {
 
 motorDevice_t *motorPwmDevInit(const motorDevConfig_t *motorConfig, uint16_t idlePulse, uint8_t motorCount, bool useUnsyncedPwm)
 {
+    memset(motors, 0, sizeof(motors));
+
     motorPwmDevice.vTable = motorPwmVTable;
 
     float sMin = 0;

diff --git a/src/platform/AT32/dshot_bitbang.c b/src/platform/AT32/dshot_bitbang.c
@@ -756,7 +756,7 @@ motorDevice_t *dshotBitbangDevInit(const motorDevConfig_t *motorConfig, uint8_t
             IOHi(io);
         }
 
-        // Fill in motors structure for 4way access (XXX Should be refactored)
+        // Fill in motors structure for 4way access (TODO: Should be refactored)
         motors[motorIndex].io = bbMotors[motorIndex].io;
     }
 

diff --git a/src/platform/AT32/pwm_output_at32bsp.c b/src/platform/AT32/pwm_output_at32bsp.c
@@ -151,6 +151,8 @@ static motorVTable_t motorPwmVTable = {
 
 motorDevice_t *motorPwmDevInit(const motorDevConfig_t *motorConfig, uint16_t idlePulse, uint8_t motorCount, bool useUnsyncedPwm)
 {
+    memset(motors, 0, sizeof(motors));
+
     motorPwmDevice.vTable = motorPwmVTable;
 
     float sMin = 0;

diff --git a/src/platform/STM32/pwm_output.c b/src/platform/STM32/pwm_output.c
@@ -183,6 +183,8 @@ static motorVTable_t motorPwmVTable = {
 
 motorDevice_t *motorPwmDevInit(const motorDevConfig_t *motorConfig, uint16_t idlePulse, uint8_t motorCount, bool useUnsyncedPwm)
 {
+    memset(motors, 0, sizeof(motors));
+
     motorPwmDevice.vTable = motorPwmVTable;
 
     float sMin = 0;