Merge pull request #11220 from sensei-hacker/fix-blackbox-motors-null-bytes

sensei-hacker · web-flow · commit 85f4ebb755d9 · 2026-01-10T16:53:13.000-06:00
Fix blackbox corruption when no motors defined in mixer
diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c
@@ -987,7 +987,7 @@ static void writeIntraframe(void)
         blackboxWriteSignedVBArray(blackboxCurrent->debug, DEBUG32_VALUE_COUNT);
     }
 
-    if (testBlackboxCondition(FLIGHT_LOG_FIELD_CONDITION_MOTORS)) {
+    if (testBlackboxCondition(FLIGHT_LOG_FIELD_CONDITION_AT_LEAST_MOTORS_1)) {
         //Motors can be below minthrottle when disarmed, but that doesn't happen much
         blackboxWriteUnsignedVB(blackboxCurrent->motor[0] - getThrottleIdleValue());
 
@@ -1254,7 +1254,7 @@ static void writeInterframe(void)
         blackboxWriteArrayUsingAveragePredictor32(offsetof(blackboxMainState_t, debug), DEBUG32_VALUE_COUNT);
     }
 
-    if (testBlackboxCondition(FLIGHT_LOG_FIELD_CONDITION_MOTORS)) {
+    if (testBlackboxCondition(FLIGHT_LOG_FIELD_CONDITION_AT_LEAST_MOTORS_1)) {
         blackboxWriteArrayUsingAveragePredictor16(offsetof(blackboxMainState_t, motor),     getMotorCount());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -987,7 +987,7 @@ static void writeIntraframe(void)`
`987`	`987`	`blackboxWriteSignedVBArray(blackboxCurrent->debug, DEBUG32_VALUE_COUNT);`
`988`	`988`	`}`
`989`	`989`
`990`		`- if (testBlackboxCondition(FLIGHT_LOG_FIELD_CONDITION_MOTORS)) {`
	`990`	`+ if (testBlackboxCondition(FLIGHT_LOG_FIELD_CONDITION_AT_LEAST_MOTORS_1)) {`
`991`	`991`	`//Motors can be below minthrottle when disarmed, but that doesn't happen much`
`992`	`992`	`blackboxWriteUnsignedVB(blackboxCurrent->motor[0] - getThrottleIdleValue());`
`993`	`993`
`@@ -1254,7 +1254,7 @@ static void writeInterframe(void)`
`1254`	`1254`	`blackboxWriteArrayUsingAveragePredictor32(offsetof(blackboxMainState_t, debug), DEBUG32_VALUE_COUNT);`
`1255`	`1255`	`}`
`1256`	`1256`
`1257`		`- if (testBlackboxCondition(FLIGHT_LOG_FIELD_CONDITION_MOTORS)) {`
	`1257`	`+ if (testBlackboxCondition(FLIGHT_LOG_FIELD_CONDITION_AT_LEAST_MOTORS_1)) {`
`1258`	`1258`	`blackboxWriteArrayUsingAveragePredictor16(offsetof(blackboxMainState_t, motor), getMotorCount());`
`1259`	`1259`	`}`
`1260`	`1260`