Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 17:55:30 +03:00
Code Issues Wiki Activity

Default blackbox device to NONE on reset (#12221)

Browse source 
* Default blackbox device to NONE on reset

* Add check for flashIsSupported

* Move blackbox validation outside of validateAndFixGyroConfig()
This commit is contained in:
Mark Haslinghuis 2023-01-29 01:42:32 +01:00 • committed by GitHub
parent 99088f28d1
commit d9264045b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/blackbox/blackbox.c
View file

@ -88,7 +88,7 @@
#elif defined(ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT) #elif defined(ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT)
#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SDCARD
#else #else
#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SERIAL #define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_NONE
#endif #endif
PG_REGISTER_WITH_RESET_TEMPLATE(blackboxConfig_t, blackboxConfig, PG_BLACKBOX_CONFIG, 3); 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) 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) { switch (blackboxConfig()->device) {
#ifdef USE_FLASHFS #ifdef USE_FLASHFS
case BLACKBOX_DEVICE_FLASH: case BLACKBOX_DEVICE_FLASH:
@ -886,7 +886,7 @@ void blackboxValidateConfig(void)
break; break;
default: default:
blackboxConfigMutable()->device = BLACKBOX_DEVICE_SERIAL; blackboxConfigMutable()->device = BLACKBOX_DEVICE_NONE;
} }
} }

28
src/main/config/config.c
View file

@ -593,6 +593,10 @@ static void validateAndFixConfig(void)
} }
#endif #endif
#ifdef USE_BLACKBOX
validateAndFixBlackBox();
#endif // USE_BLACKBOX
#if defined(TARGET_VALIDATECONFIG) #if defined(TARGET_VALIDATECONFIG)
// This should be done at the end of the validation // This should be done at the end of the validation
targetValidateConfiguration(); 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 #ifdef USE_BLACKBOX
void validateAndFixBlackBox(void) {
#ifndef USE_FLASHFS #ifndef USE_FLASHFS
if (blackboxConfig()->device == BLACKBOX_DEVICE_FLASH) { if (blackboxConfig()->device == BLACKBOX_DEVICE_FLASH) {
blackboxConfigMutable()->device = BLACKBOX_DEVICE_NONE; blackboxConfigMutable()->device = BLACKBOX_DEVICE_NONE;
@ -702,18 +718,8 @@ void validateAndFixGyroConfig(void)
blackboxConfigMutable()->device = BLACKBOX_DEVICE_NONE; 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) bool readEEPROM(void)
{ {

3
src/main/config/config.h
View file

@ -68,6 +68,9 @@ void ensureEEPROMStructureIsValid(void);
void saveConfigAndNotify(void); void saveConfigAndNotify(void);
void validateAndFixGyroConfig(void); void validateAndFixGyroConfig(void);
#ifdef USE_BLACKBOX
void validateAndFixBlackBox(void);
#endif
void setConfigDirty(void); void setConfigDirty(void);
bool isConfigDirty(void); bool isConfigDirty(void);

8
src/main/target/common_post.h
View file

@ -234,9 +234,6 @@
#endif #endif
#ifdef USE_FLASH #ifdef USE_FLASH
#define USE_FLASHFS
#define USE_FLASH_TOOLS
#endif
#if (defined(USE_FLASH_W25M512) || defined(USE_FLASH_W25Q128FV)) && !defined(USE_FLASH_M25P16) #if (defined(USE_FLASH_W25M512) || defined(USE_FLASH_W25Q128FV)) && !defined(USE_FLASH_M25P16)
#define 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) #if defined(USE_FLASH_M25P16) || defined(USE_FLASH_W25M) || defined(USE_FLASH_W25N01G) || defined(USE_FLASH_W25Q128FV)
#define USE_FLASH_CHIP #define USE_FLASH_CHIP
#define USE_FLASH_TOOLS
#define USE_FLASHFS
#endif #endif
#endif // USE_FLASH
#ifndef USE_FLASH_CHIP #ifndef USE_FLASH_CHIP
#undef USE_FLASH_TOOLS
#undef USE_FLASHFS #undef USE_FLASHFS
#endif #endif

2
src/test/unit/target.h
View file

@ -72,8 +72,6 @@
#define TARGET_BOARD_IDENTIFIER "TEST" #define TARGET_BOARD_IDENTIFIER "TEST"
#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_SERIAL
#define LED_STRIP_TIMER 1 #define LED_STRIP_TIMER 1
#define SOFTSERIAL_1_TIMER 2 #define SOFTSERIAL_1_TIMER 2
#define SOFTSERIAL_2_TIMER 3 #define SOFTSERIAL_2_TIMER 3