Default blackbox device to NONE on reset (#12221)

* Default blackbox device to NONE on reset * Add check for flashIsSupported * Move blackbox validation outside of validateAndFixGyroConfig()
betaflight · Jan 29, 2023 · d926404 · d926404
1 parent 99088f2
commit d926404
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 19 deletions.
diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c
@@ -88,7 +88,7 @@
 #elif defined(ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT)
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_SDCARD
 #else
-#define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_SERIAL
+#define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_NONE
 #endif
 
 PG_REGISTER_WITH_RESET_TEMPLATE(blackboxConfig_t, blackboxConfig, PG_BLACKBOX_CONFIG, 3);
@@ -873,7 +873,7 @@ STATIC_UNIT_TESTED bool writeSlowFrameIfNeeded(void)
 
 void blackboxValidateConfig(void)
 {
-    // If we've chosen an unsupported device, change the device to serial
+    // If we've chosen an unsupported device, change the device to NONE
     switch (blackboxConfig()->device) {
 #ifdef USE_FLASHFS
     case BLACKBOX_DEVICE_FLASH:
@@ -886,7 +886,7 @@ void blackboxValidateConfig(void)
         break;
 
     default:
-        blackboxConfigMutable()->device = BLACKBOX_DEVICE_SERIAL;
+        blackboxConfigMutable()->device = BLACKBOX_DEVICE_NONE;
     }
 }
 

diff --git a/src/main/config/config.c b/src/main/config/config.c
@@ -593,6 +593,10 @@ static void validateAndFixConfig(void)
     }
 #endif
 
+#ifdef USE_BLACKBOX
+    validateAndFixBlackBox();
+#endif // USE_BLACKBOX
+
 #if defined(TARGET_VALIDATECONFIG)
     // This should be done at the end of the validation
     targetValidateConfiguration();
@@ -687,7 +691,19 @@ void validateAndFixGyroConfig(void)
         }
     }
 
+    if (systemConfig()->activeRateProfile >= CONTROL_RATE_PROFILE_COUNT) {
+        systemConfigMutable()->activeRateProfile = 0;
+    }
+    loadControlRateProfile();
+
+    if (systemConfig()->pidProfileIndex >= PID_PROFILE_COUNT) {
+        systemConfigMutable()->pidProfileIndex = 0;
+    }
+    loadPidProfile();
+}
+
 #ifdef USE_BLACKBOX
+void validateAndFixBlackBox(void) {
 #ifndef USE_FLASHFS
     if (blackboxConfig()->device == BLACKBOX_DEVICE_FLASH) {
         blackboxConfigMutable()->device = BLACKBOX_DEVICE_NONE;
@@ -702,18 +718,8 @@ void validateAndFixGyroConfig(void)
             blackboxConfigMutable()->device = BLACKBOX_DEVICE_NONE;
         }
     }
-#endif // USE_BLACKBOX
-
-    if (systemConfig()->activeRateProfile >= CONTROL_RATE_PROFILE_COUNT) {
-        systemConfigMutable()->activeRateProfile = 0;
-    }
-    loadControlRateProfile();
-
-    if (systemConfig()->pidProfileIndex >= PID_PROFILE_COUNT) {
-        systemConfigMutable()->pidProfileIndex = 0;
-    }
-    loadPidProfile();
 }
+#endif // USE_BLACKBOX
 
 bool readEEPROM(void)
 {

diff --git a/src/main/config/config.h b/src/main/config/config.h
@@ -68,6 +68,9 @@ void ensureEEPROMStructureIsValid(void);
 
 void saveConfigAndNotify(void);
 void validateAndFixGyroConfig(void);
+#ifdef USE_BLACKBOX
+void validateAndFixBlackBox(void);
+#endif
 
 void setConfigDirty(void);
 bool isConfigDirty(void);

diff --git a/src/main/target/common_post.h b/src/main/target/common_post.h
@@ -234,9 +234,6 @@
 #endif
 
 #ifdef USE_FLASH
-#define USE_FLASHFS
-#define USE_FLASH_TOOLS
-#endif
 
 #if (defined(USE_FLASH_W25M512) || defined(USE_FLASH_W25Q128FV)) && !defined(USE_FLASH_M25P16)
 #define USE_FLASH_M25P16
@@ -252,9 +249,14 @@
 
 #if defined(USE_FLASH_M25P16) || defined(USE_FLASH_W25M) || defined(USE_FLASH_W25N01G) || defined(USE_FLASH_W25Q128FV)
 #define USE_FLASH_CHIP
+#define USE_FLASH_TOOLS
+#define USE_FLASHFS
 #endif
 
+#endif // USE_FLASH
+
 #ifndef USE_FLASH_CHIP
+#undef USE_FLASH_TOOLS
 #undef USE_FLASHFS
 #endif
 

diff --git a/src/test/unit/target.h b/src/test/unit/target.h
@@ -72,8 +72,6 @@
 
 #define TARGET_BOARD_IDENTIFIER "TEST"
 
-#define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_SERIAL
-
 #define LED_STRIP_TIMER 1
 #define SOFTSERIAL_1_TIMER 2
 #define SOFTSERIAL_2_TIMER 3